diff --git a/src/backend/core/admin.py b/src/backend/core/admin.py
index 5ab86bb..8f6ac75 100644
--- a/src/backend/core/admin.py
+++ b/src/backend/core/admin.py
@@ -82,6 +82,15 @@ class UserAdmin(auth_admin.UserAdmin):
         ),
         (_("Important dates"), {"fields": ("created_at", "updated_at")}),
     )
+    add_fieldsets = (
+        (
+            None,
+            {
+                "classes": ("wide",),
+                "fields": ("email", "password1", "password2"),
+            },
+        ),
+    )
     inlines = (IdentityInline, TeamAccessInline)
     list_display = (
         "email",
diff --git a/src/backend/core/models.py b/src/backend/core/models.py
index f9f7cde..368edb5 100644
--- a/src/backend/core/models.py
+++ b/src/backend/core/models.py
@@ -288,7 +288,8 @@ class Identity(BaseModel):
 
     def __str__(self):
         main_str = "[main]" if self.is_main else ""
-        return f"{self.email:s}{main_str:s}"
+        id_str = self.email or self.sub
+        return f"{id_str:s}{main_str:s}"
 
     def save(self, *args, **kwargs):
         """Ensure users always have one and only one main identity."""