diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index 191f7f4fb..5a3c921c1 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -594,7 +594,7 @@ for param in dir(configuration):
 SOCIAL_AUTH_JSONFIELD_ENABLED = True
 SOCIAL_AUTH_CLEAN_USERNAME_FUNCTION = 'users.utils.clean_username'
 
-SOCIAL_AUTH_USER_MODEL = 'users.User'
+SOCIAL_AUTH_USER_MODEL = AUTH_USER_MODEL
 
 #
 # Django Prometheus
diff --git a/netbox/users/models.py b/netbox/users/models.py
index 379d05d0d..847e9ea81 100644
--- a/netbox/users/models.py
+++ b/netbox/users/models.py
@@ -24,9 +24,9 @@ from .constants import *
 
 __all__ = (
     'NetBoxGroup',
-    'User',
     'ObjectPermission',
     'Token',
+    'User',
     'UserConfig',
 )
 
@@ -73,7 +73,6 @@ class NetBoxGroup(Group):
     objects = NetBoxGroupManager()
 
     class Meta:
-        # db_table = 'auth_group'
         proxy = True
         ordering = ('name',)
         verbose_name = _('group')
@@ -220,7 +219,6 @@ class UserConfig(models.Model):
             self.save()
 
 
-@receiver(post_save, sender=User)
 @receiver(post_save, sender=User)
 def create_userconfig(instance, created, raw=False, **kwargs):
     """