diff --git a/.idea/.idea.ProjectLighthouse/.idea/jsLibraryMappings.xml b/.idea/.idea.ProjectLighthouse/.idea/jsLibraryMappings.xml
new file mode 100644
index 00000000..923bf2ee
--- /dev/null
+++ b/.idea/.idea.ProjectLighthouse/.idea/jsLibraryMappings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptLibraryMappings">
+    <file url="PROJECT" libraries="{sha256}" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/ProjectLighthouse/Pages/ExternalAuth/LoginForm.cshtml b/ProjectLighthouse/Pages/ExternalAuth/LoginForm.cshtml
index 8f066355..4dd2fefd 100644
--- a/ProjectLighthouse/Pages/ExternalAuth/LoginForm.cshtml
+++ b/ProjectLighthouse/Pages/ExternalAuth/LoginForm.cshtml
@@ -4,8 +4,21 @@
 @{
     Layout = "Layouts/BaseLayout";
 }
+
+<script src="https://geraintluff.github.io/sha256/sha256.min.js"></script>
+
+<script>
+    function onSubmit(form) {
+        const password = form['password'];
+        
+        password.value = sha256(password.value);
+        
+        return true;
+    }
+</script>
+
 <h1>Log in</h1>
-<form>
+<form onsubmit="return onSubmit(this)">
     <label for="text">Username: </label>
     <input type="text" name="username" id="text"><br>
 
diff --git a/ProjectLighthouse/Pages/ExternalAuth/RegisterForm.cshtml b/ProjectLighthouse/Pages/ExternalAuth/RegisterForm.cshtml
index e3c012d7..89dee5c4 100644
--- a/ProjectLighthouse/Pages/ExternalAuth/RegisterForm.cshtml
+++ b/ProjectLighthouse/Pages/ExternalAuth/RegisterForm.cshtml
@@ -5,8 +5,23 @@
     Layout = "Layouts/BaseLayout";
 }
 
+<script src="https://geraintluff.github.io/sha256/sha256.min.js"></script>
+
+<script>
+    function onSubmit(form) {
+        const password = form['password'];
+        const confirmPassword = form['confirmPassword'];
+        
+        password.value = sha256(password.value);
+        confirmPassword.value = sha256(confirmPassword.value);
+        
+        return true;
+    }
+</script>
+
+
 <h1>Register</h1>
-<form>
+<form onsubmit="return onSubmit(this)">
     <label for="text">Username: </label>
     <input type="text" name="username" id="text"><br>
 
diff --git a/ProjectLighthouse/Pages/ExternalAuth/RegisterForm.cshtml.cs b/ProjectLighthouse/Pages/ExternalAuth/RegisterForm.cshtml.cs
index 6635c552..de254889 100644
--- a/ProjectLighthouse/Pages/ExternalAuth/RegisterForm.cshtml.cs
+++ b/ProjectLighthouse/Pages/ExternalAuth/RegisterForm.cshtml.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
@@ -20,18 +19,16 @@ namespace LBPUnion.ProjectLighthouse.Pages.ExternalAuth
         [SuppressMessage("ReSharper", "SpecifyStringComparison")]
         public async Task<IActionResult> OnGet([FromQuery] string username, [FromQuery] string password, [FromQuery] string confirmPassword)
         {
-            this.WasRegisterRequest = !string.IsNullOrEmpty(username) &&
-                                      !string.IsNullOrEmpty(password) &&
-                                      !string.IsNullOrEmpty(confirmPassword) &&
-                                      password == confirmPassword;
+            this.WasRegisterRequest = !string.IsNullOrEmpty(username) && !string.IsNullOrEmpty(password) && !string.IsNullOrEmpty(confirmPassword);
 
             if (WasRegisterRequest)
             {
-                Console.WriteLine(password);
+                if (password != confirmPassword) return this.BadRequest();
+
                 bool userExists = await this.Database.Users.FirstOrDefaultAsync(u => u.Username.ToLower() == username.ToLower()) != null;
                 if (userExists) return this.BadRequest();
 
-                this.Database.CreateUser(username, HashHelper.BCryptHash(password));
+                await this.Database.CreateUser(username, HashHelper.BCryptHash(password));
             }
 
             return this.Page();