diff --git a/netbox/templates/users/base.html b/netbox/templates/users/base.html
index 58861ee90..5b5f860f7 100644
--- a/netbox/templates/users/base.html
+++ b/netbox/templates/users/base.html
@@ -1,4 +1,9 @@
-{% extends 'base/layout.html' %}
+{% extends 'generic/object.html' %}
+{% load buttons %}
+{% load static %}
+{% load helpers %}
+{% load plugins %}
+
 
 {% block tabs %}
   <ul class="nav nav-tabs px-3">
diff --git a/netbox/users/filtersets.py b/netbox/users/filtersets.py
index e89f35830..8d900edb8 100644
--- a/netbox/users/filtersets.py
+++ b/netbox/users/filtersets.py
@@ -50,7 +50,7 @@ class UserFilterSet(BaseFilterSet):
 
     class Meta:
         model = get_user_model()
-        fields = ['id', 'username', 'first_name', 'last_name', 'email', 'is_staff', 'is_active']
+        fields = ['id', 'username', 'first_name', 'last_name', 'email', 'is_staff', 'is_active', 'is_superuser']
 
     def search(self, queryset, name, value):
         if not value.strip():
diff --git a/netbox/users/forms/model_forms.py b/netbox/users/forms/model_forms.py
index 39929afa1..1d7133d2a 100644
--- a/netbox/users/forms/model_forms.py
+++ b/netbox/users/forms/model_forms.py
@@ -198,6 +198,7 @@ class GroupForm(BootstrapMixin, forms.ModelForm):
 
 
 class ObjectPermissionForm(BootstrapMixin, forms.ModelForm):
+    actions = forms.CharField(required=False)
     users = DynamicModelMultipleChoiceField(
         required=False,
         queryset=get_user_model().objects.all()
@@ -219,7 +220,7 @@ class ObjectPermissionForm(BootstrapMixin, forms.ModelForm):
     fieldsets = (
         (None, ('name', 'description', 'enabled',)),
         ('Actions', ('can_view', 'can_add', 'can_change', 'can_delete', 'actions')),
-        ('Objects', ('object_types')),
+        ('Objects', ('object_types', )),
         ('Assignment', ('groups', 'users')),
         ('Constraints', ('constraints',))
     )