diff --git a/Watcher/Watcher/accounts/admin.py b/Watcher/Watcher/accounts/admin.py
index 213234c..08c826f 100644
--- a/Watcher/Watcher/accounts/admin.py
+++ b/Watcher/Watcher/accounts/admin.py
@@ -82,6 +82,7 @@ class LogEntryAdmin(admin.ModelAdmin):
         UserFilter,
         ActionFilter,
         'content_type',
+        # 'user',
     ]
 
     search_fields = [
@@ -131,12 +132,19 @@ def action_description(self, obj):
 
     action_description.short_description = 'Action'
 
+
 admin.site.register(LogEntry, LogEntryAdmin)
 
 
 class APIKeyForm(forms.ModelForm):
     EXPIRATION_CHOICES = (
-        (1, '1 day'), (7, '7 days'), (30, '30 days'), (60, '60 days'), (90, '90 days'), (365, '1 year'), (730, '2 years'),
+        (1, '1 day'), 
+        (7, '7 days'), 
+        (30, '30 days'), 
+        (60, '60 days'),
+        (90, '90 days'), 
+        (365, '1 year'), 
+        (730, '2 years'),
     )
     expiration = forms.ChoiceField(choices=EXPIRATION_CHOICES, label='Expiration', required=True)
     user = forms.ModelChoiceField(queryset=User.objects.all(), label='User', required=True)
@@ -273,9 +281,11 @@ def get_exclude(self, request, obj=None):
             return ['key']
 
     def has_view_permission(self, request, obj=None):
-        if obj and not request.user.is_superuser:
-            return obj.auth_token.user == request.user
-        return super().has_view_permission(request, obj)
+        if request.user.is_superuser:
+            return True
+        if obj is None:
+            return True
+        return obj.user == request.user
 
     def key_details(self, obj):
         if obj.auth_token: