diff --git a/pydotorg/settings/base.py b/pydotorg/settings/base.py
index 5d3f53f86..aabaccc71 100644
--- a/pydotorg/settings/base.py
+++ b/pydotorg/settings/base.py
@@ -96,10 +96,10 @@
 ### Allauth
 LOGIN_REDIRECT_URL = "home"
 ACCOUNT_LOGOUT_REDIRECT_URL = "home"
-ACCOUNT_EMAIL_REQUIRED = True
+ACCOUNT_LOGIN_METHODS = {"email", "username"}
+ACCOUNT_SIGNUP_FIELDS = ["email*", "username*", "password1*", "password2*"]
 ACCOUNT_UNIQUE_EMAIL = True
 ACCOUNT_EMAIL_VERIFICATION = "mandatory"
-ACCOUNT_AUTHENTICATION_METHOD = "username_email"
 # TODO: Enable enumeration prevention
 ACCOUNT_PREVENT_ENUMERATION = False
 SOCIALACCOUNT_EMAIL_REQUIRED = True