diff --git a/otpauth/models.py b/otpauth/models.py
index 6e1898e..6e000d3 100644
--- a/otpauth/models.py
+++ b/otpauth/models.py
@@ -21,7 +21,11 @@ class OTPSeed(AbstractUser):
         """
         inject username to ensure it stays unique / is setup at all
         """
-        self.username = "{}@{}".format(self.name, self.realm)
+        if not self.is_superuser:
+            self.username = "{}@{}".format(self.name, self.realm)
+        else:
+            self.name = self.username
+
         super().save(*args, **kwargs)
 
     def __str__(self):