diff --git a/lib/philomena_web/controllers/registration_controller.ex b/lib/philomena_web/controllers/registration_controller.ex
index 05445ca16..389ae579f 100644
--- a/lib/philomena_web/controllers/registration_controller.ex
+++ b/lib/philomena_web/controllers/registration_controller.ex
@@ -36,7 +36,7 @@ defmodule PhilomenaWeb.RegistrationController do
   end
 
   def edit(conn, _params) do
-    render(conn, "edit.html")
+    render(conn, "edit.html", title: "Account Settings")
   end
 
   defp assign_email_and_password_changesets(conn, _opts) do
diff --git a/lib/philomena_web/templates/password/edit.html.slime b/lib/philomena_web/templates/password/edit.html.slime
index 02a420f6b..0046b4d90 100644
--- a/lib/philomena_web/templates/password/edit.html.slime
+++ b/lib/philomena_web/templates/password/edit.html.slime
@@ -6,11 +6,11 @@ h1 Reset password
       p Oops, something went wrong! Please check the errors below.
 
   .field
-    = password_input f, :password, class: "input", placeholder: "New password"
+    = password_input f, :password, class: "input", placeholder: "New password", minlength: 12
     = error_tag f, :password
 
   .field
-    = password_input f, :password_confirmation, class: "input", placeholder: "Confirm new password"
+    = password_input f, :password_confirmation, class: "input", placeholder: "Confirm new password", minlength: 12
     = error_tag f, :password_confirmation
 
   div
diff --git a/lib/philomena_web/templates/registration/edit.html.slime b/lib/philomena_web/templates/registration/edit.html.slime
index 7e40e174f..d7ba2046d 100644
--- a/lib/philomena_web/templates/registration/edit.html.slime
+++ b/lib/philomena_web/templates/registration/edit.html.slime
@@ -53,11 +53,11 @@ h3 Change password
       p Oops, something went wrong! Please check the errors below.
 
   .field
-    = password_input f, :password, class: "input", placeholder: "New password"
+    = password_input f, :password, class: "input", placeholder: "New password", minlength: 12
     = error_tag f, :password
 
   .field
-    = password_input f, :password_confirmation, class: "input", placeholder: "Confirm new password"
+    = password_input f, :password_confirmation, class: "input", placeholder: "Confirm new password", minlength: 12
     = error_tag f, :password_confirmation
 
   .field
diff --git a/lib/philomena_web/templates/registration/new.html.slime b/lib/philomena_web/templates/registration/new.html.slime
index fb19a3fc4..99e49ab6a 100644
--- a/lib/philomena_web/templates/registration/new.html.slime
+++ b/lib/philomena_web/templates/registration/new.html.slime
@@ -22,10 +22,10 @@ h1 Register
   .fieldlabel
     ' Pick a good strong password - longer is better! Minimum of 12 characters.
   .field
-    = password_input f, :password, class: "input", placeholder: "Password", required: true
+    = password_input f, :password, class: "input", placeholder: "Password", required: true, minlength: 12
     = error_tag f, :password
   .field
-    = password_input f, :password_confirmation, class: "input", placeholder: "Confirm password", required: true
+    = password_input f, :password_confirmation, class: "input", placeholder: "Confirm password", required: true, minlength: 12
     = error_tag f, :password_confirmation
 
   = render PhilomenaWeb.CaptchaView, "_captcha.html", name: "registration", conn: @conn