diff --git a/files/routes/login.py b/files/routes/login.py
index d8111f739..5b24572d7 100644
--- a/files/routes/login.py
+++ b/files/routes/login.py
@@ -245,7 +245,7 @@ def sign_up_post(v):
 
 	now = int(time.time())
 
-	username = request.values.get("username")
+	username = request.values.get("usernametwo")
 	
 	if not username: abort(400)
 
diff --git a/files/templates/login/sign_up.html b/files/templates/login/sign_up.html
index 6694ef937..76bc5cca2 100644
--- a/files/templates/login/sign_up.html
+++ b/files/templates/login/sign_up.html
@@ -22,7 +22,7 @@
 			{% if redirect %}<input type="hidden" name="redirect" value="{{redirect}}">{% endif %}
 			{% if ref_user %}<input type="hidden" name="referred_by" value="{{ref_user.id}}">{% endif %}
 			<label for="username-register" class="mt-3">Username</label>
-			<input autocomplete="off" class="form-control" id="username-register" aria-describedby="usernameHelpRegister" type="text" name="username" pattern="[a-zA-Z0-9_\-]{3,25}" min="3" max="25" required autofocus tabindex="1">
+			<input autocomplete="off" class="form-control" id="username-register" aria-describedby="usernameHelpRegister" type="text" name="usernametwo" pattern="[a-zA-Z0-9_\-]{3,25}" min="3" max="25" required autofocus tabindex="1">
 			<small id="usernameHelpRegister"></small>
 
 			<label for="email-register" class="mt-3">Email Address</label> <small class="d-inline-block text-muted ml-1">(optional)</small>
diff --git a/files/tests/fixture_accounts.py b/files/tests/fixture_accounts.py
index 10514d941..ab4878372 100644
--- a/files/tests/fixture_accounts.py
+++ b/files/tests/fixture_accounts.py
@@ -25,7 +25,7 @@ class AccountsFixture:
 		print(f"Signing up as {username}")
 
 		signup_post_response = client.post("/signup", data={
-			"username": username,
+			"usernametwo": username,
 			"password": "password",
 			"password_confirm": "password",
 			"email": "",