diff --git a/babybuddy/forms.py b/babybuddy/forms.py
index 2224b990..ac350e4c 100644
--- a/babybuddy/forms.py
+++ b/babybuddy/forms.py
@@ -11,13 +11,15 @@ from .models import Settings
 class UserAddForm(UserCreationForm):
     class Meta:
         model = User
-        fields = ['username', 'first_name', 'last_name', 'email']
+        fields = ['username', 'first_name', 'last_name', 'email',
+                  'is_staff', 'is_active']
 
 
 class UserUpdateForm(forms.ModelForm):
     class Meta:
         model = User
-        fields = ['username', 'first_name', 'last_name', 'email']
+        fields = ['username', 'first_name', 'last_name', 'email',
+                  'is_staff', 'is_active']
 
 
 class UserForm(forms.ModelForm):
diff --git a/babybuddy/templates/babybuddy/user_list.html b/babybuddy/templates/babybuddy/user_list.html
index f502452f..2e7e0aa8 100644
--- a/babybuddy/templates/babybuddy/user_list.html
+++ b/babybuddy/templates/babybuddy/user_list.html
@@ -1,5 +1,5 @@
 {% extends 'babybuddy/page.html' %}
-{% load widget_tweaks static thumbnail %}
+{% load bootstrap widget_tweaks %}
 
 {% block title %}Users{% endblock %}
 
@@ -18,6 +18,8 @@
                     <th>First Name</th>
                     <th>Last Name</th>
                     <th>Email</th>
+                    <th>Staff</th>
+                    <th>Active</th>
                     <th class="text-center">Actions</th>
                 </tr>
             </thead>
@@ -28,6 +30,8 @@
                         <td>{{ object.first_name }}</td>
                         <td>{{ object.last_name }}</td>
                         <td>{{ object.email }}</td>
+                        <td>{{ object.is_staff|bool_icon }}</td>
+                        <td>{{ object.is_active|bool_icon }}</td>
                         <td class="text-center">
                             <div class="btn-group btn-group-sm" role="group" aria-label="Actions">