diff --git a/controllers/database/user.py b/controllers/database/user.py
index 3325cdb..e800f1c 100644
--- a/controllers/database/user.py
+++ b/controllers/database/user.py
@@ -63,9 +63,11 @@ class UserController(DatabaseController):
 
         return self.convert_type(self.get_one(query, params))
 
-    def read_all(self) -> list[User] | None:
-        params = []
-        query = """ SELECT * FROM Users """
+    def read_all(self, username: str = "") -> list[User] | None:
+        params = [
+            "%" + username + "%"
+        ]
+        query = """ SELECT * FROM Users WHERE Username like ? """
 
         return self.get_many(query, params)
 
diff --git a/controllers/web/admin.py b/controllers/web/admin.py
index 8a41765..02592b0 100644
--- a/controllers/web/admin.py
+++ b/controllers/web/admin.py
@@ -2,7 +2,7 @@
     in the web app
 """
 
-from flask import render_template, Blueprint, redirect, url_for, flash
+from flask import render_template, Blueprint, redirect, url_for, flash, request
 
 from controllers.database.user import UserController
 from controllers.database.product import ProductController
@@ -34,7 +34,14 @@ def users():
     """ Endpoint responsible for managing a users permissions """
     # Get all users to create admin table on frontend
     db = UserController()
-    users = db.read_all()
+
+    search = request.args.get('search')
+
+    # Don't try submitting a None Type
+    if not search:
+        search = ""
+
+    users = db.read_all(search)
 
     return render_template("index.html", content="admin.html", users=users)
 
@@ -44,9 +51,14 @@ def products():
     """ Endpoint responsible for managing products on the site """
     # Get all products to create admin table on frontend
     db = ProductController()
-    products = db.read_all()
 
-    print(len(products))
+    search = request.args.get('search')
+
+    # Don't try submitting a None Type
+    if not search:
+        search = ""
+
+    products = db.read_all("", search)
 
     return render_template(
         "index.html",
diff --git a/controllers/web/user.py b/controllers/web/user.py
index 3eef393..0e027ac 100644
--- a/controllers/web/user.py
+++ b/controllers/web/user.py
@@ -68,7 +68,7 @@ def display_update(id: int):
     db = UserController()
     user = db.read_id(id)
 
-    return render_template('index.html', content="user.html", user=user)
+    return render_template('index.html', content="user.html", updating_user=user)
 
 
 @blueprint.post('/update/<int:id>')
@@ -100,6 +100,14 @@ def update(id: int):
             "warning"
         )
         return redirect(url_for('main.users.display_update', id=id))
+    
+    # Invalid role submitted
+    if user.role not in ROLES:
+        flash(
+            f"Selected role, {user.role}, is not valid!",
+            "warning"
+        )
+        return redirect(url_for('main.users.display_update', id=id))
 
     db.update(user)
 
diff --git a/templates/user.html b/templates/user.html
index 859e5b9..2d86c4f 100644
--- a/templates/user.html
+++ b/templates/user.html
@@ -2,26 +2,26 @@
 
 <div id="form-wrapper">
     <h2>Update User</h2>
-    {% if user != None %}
-        <form class="input-form" action="{{ url_for('main.users.update', id=user.id) }}" method="POST">
+    {% if updating_user != None %}
+        <form class="input-form" action="{{ url_for('main.users.update', id=updating_user.id) }}" method="POST">
             <div class="form-row">
-                <input type="text" id="firstname" name="firstname" placeholder="First Name" value="{{user.firstName}}" required>
-                <input type="text" id="lastname" name="lastname" placeholder="Last Name" value="{{user.lastName}}" required>
+                <input type="text" id="firstname" name="firstname" placeholder="First Name" value="{{updating_user.firstName}}" required>
+                <input type="text" id="lastname" name="lastname" placeholder="Last Name" value="{{updating_user.lastName}}" required>
             </div>
 
             <div class="form-row">
-                <input type="text" id="username" name="username" placeholder="Username" value="{{user.username}}" required>
-                <input type="email" id="email" name="email" placeholder="Email Address" value="{{user.email}}" required>
+                <input type="text" id="username" name="username" placeholder="Username" value="{{updating_user.username}}" required>
+                <input type="email" id="email" name="email" placeholder="Email Address" value="{{updating_user.email}}" required>
             </div>
 
             <div class="form-row">
-                <input type="tel" id="phone" name="phone" placeholder="Telephone Number" value="{{user.phone}}" required>
+                <input type="tel" id="phone" name="phone" placeholder="Telephone Number" value="{{updating_user.phone}}" required>
             </div>
 
             <div class="form-row">
                 <select name="role" id="role">
                     {% for role in roles %}
-                        {% if role == user.role %}
+                        {% if role == updating_user.role %}
                             <option value="{{role}}" selected>{{role}}</option>
                         {% else %}
                             <option value="{{role}}">{{role}}</option>