diff --git a/src/main/java/me/exzork/gcauth/handler/RegisterHandler.java b/src/main/java/me/exzork/gcauth/handler/RegisterHandler.java
index 2949baa..dee818b 100644
--- a/src/main/java/me/exzork/gcauth/handler/RegisterHandler.java
+++ b/src/main/java/me/exzork/gcauth/handler/RegisterHandler.java
@@ -30,15 +30,24 @@ public class RegisterHandler implements HttpContextHandler {
                 if (registerAccount.password.equals(registerAccount.password_confirmation)) {
                     if (registerAccount.password.length() >= 8) {
                         String password = Authentication.generateHash(registerAccount.password);
-                        Account account = DatabaseHelper.createAccountWithPassword(registerAccount.username, password);
-                        if (account == null) {
-                            authResponse.success = false;
-                            authResponse.message = "USERNAME_TAKEN"; // ENG = "Username has already been taken by another user."
-                            authResponse.jwt = "";
-                        } else {
+                        Account account = Authentication.getAccountByUsernameAndPassword(registerAccount.username, "");
+                        if (account != null) {
+                            account.setPassword(password);
+                            account.save();
                             authResponse.success = true;
                             authResponse.message = "";
                             authResponse.jwt = "";
+                        } else {
+                            account = DatabaseHelper.createAccountWithPassword(registerAccount.username, password);
+                            if (account == null) {
+                                authResponse.success = false;
+                                authResponse.message = "USERNAME_TAKEN"; // ENG = "Username has already been taken by another user."
+                                authResponse.jwt = "";
+                            } else {
+                                authResponse.success = true;
+                                authResponse.message = "";
+                                authResponse.jwt = "";
+                            }
                         }
                     } else {
                         authResponse.success = false;