Set username to fall back to email address

ghostwriter/users/adapters.py

@@ -75,14 +75,16 @@ def populate_user(self, request, sociallogin, data):
         last_name = data.get("last_name")
         email = data.get("email")
         name = data.get("name")
+
+        # If no username or the username is the email address
+        # Use the email address but strip the domain
+        if username is None or (username == email):
+            username = email.split("@")[0]
+
         user = sociallogin.user
         user_username(user, username or "")
         user_email(user, valid_email_or_none(email) or "")
 
-        # If the username is the email address, strip the domain
-        if username == email:
-            user_username(user, username.split("@")[0])
-
         name_parts = (name or "").partition(" ")
         user_field(user, "first_name", first_name or name_parts[0])
         user_field(user, "last_name", last_name or name_parts[2])