diff --git a/account/account.py b/account/account.py
index 8acf938..7dfc6d6 100644
--- a/account/account.py
+++ b/account/account.py
@@ -161,23 +161,21 @@ def changepass():
 def register():
     # Get the form data
     username = request.form.get('username')
-    passwordhash = request.form.get('passwordhash')
+    verifyhash = request.form.get('passwordhash')
     password = request.form.get('password')
 
-    if passwordhash:
-        is_password_valid = verify_bcrypt(password_to_check, passwordhash)
-        if is_password_valid:
-            # Attempt to change the password
-            if change_email_password(username, password):
-                # Password changed
-                response.set_cookie('passwordhash', '', expires=0)
-                response.set_cookie('email', '', expires=0)
-                return redirect('/account')
-            else:
-                # Backend error, potentially maddy
-                return render_template('err.html'), 500
+    passwordhash = fetch_hash_from_database(key_to_fetch)
+
+    if password == passwordhash:
+        # Attempt to change the password
+        if change_email_password(username, password):
+            # Password changed
+            response.set_cookie('passwordhash', '', expires=0)
+            response.set_cookie('email', '', expires=0)
+            return redirect('/account')
         else:
-            return render_template('wrong.html'), 400
+            # Backend error, potentially maddy
+            return render_template('err.html'), 500
     else:
         return render_template('wrong.html'), 400
 
diff --git a/account/templates/changepass.html b/account/templates/changepass.html
index c657f89..e9e00af 100644
--- a/account/templates/changepass.html
+++ b/account/templates/changepass.html
@@ -13,8 +13,8 @@
     <div class="content">
         <h1>Change your password</h1>
         <br>
-        <form method="POST" action="/account/changeapi">
-            <input type="hidden" name="email" style="display: inline;" value="{{ user_email }}">
+        <form method="POST" style="display: inline;" action="/account/changeapi">
+            <input type="hidden" name="email" value="{{ user_email }}">
             <input type="hidden" name="passwordhash" value="{{ password_hash }}">
             <input name="password" required="">
             <input type="submit" value="Confirm">