diff --git a/files/templates/login/reset_password.html b/files/templates/login/reset_password.html
index bd340fddef..068ff354bc 100644
--- a/files/templates/login/reset_password.html
+++ b/files/templates/login/reset_password.html
@@ -8,9 +8,9 @@
 		<input hidden name="user_id" value="{{v.id}}">
 		<input hidden name="token" value="{{token}}">
 		<label for="passentry" class="mt-3">New Password</label>
-		<input autocomplete="off" class="form-control" id="passentry" type="password" name="password" required>
+		<input autocomplete="off" class="form-control" id="passentry" type="password" minlength="8" maxlength="100" name="password" required>
 		<label for="confentry" class="mt-3">Confirm New Password</label>
-		<input autocomplete="off" class="form-control" id="confentry" type="password" name="confirm_password" required>
+		<input autocomplete="off" class="form-control" id="confentry" type="password" minlength="8" maxlength="100" name="confirm_password" required>
 		<input autocomplete="off" class="btn btn-primary login w-100 mt-3" type="submit" value="Change password">
 	</form>
 </div>
diff --git a/files/templates/login/sign_up.html b/files/templates/login/sign_up.html
index 68ceba01ab..525538f389 100644
--- a/files/templates/login/sign_up.html
+++ b/files/templates/login/sign_up.html
@@ -80,16 +80,14 @@
 
 	<label for="password-register" class="mt-3">Password</label>
 
-	<input autocomplete="off" class="form-control" id="password-register" type="password" name="password" required>
-	<small id="passwordHelpRegister" class="form-text font-weight-bold text-muted d-none mt-1">Minimum of 8
-		characters
-	required.</small>
+	<input autocomplete="off" class="form-control" id="password-register" type="password" minlength="8" maxlength="100" name="password" required>
+	<small id="passwordHelpRegister" class="form-text font-weight-bold text-muted d-none mt-1">Minimum of 8 characters required.</small>
 	<small id="passwordHelpSuccess" class="form-text font-weight-bold text-success d-none mt-1">Your password meets the requirements.
 	</small>
 
 	<label for="password_confirm" class="mt-3">Confirm Password</label>
 
-	<input autocomplete="off" class="form-control" id="password_confirm" type="password" name="password_confirm" required>
+	<input autocomplete="off" class="form-control" id="password_confirm" type="password" minlength="8" maxlength="100" name="password_confirm" required>
 	<div class="custom-control custom-checkbox mt-4">
 		<input autocomplete="off" type="checkbox" class="custom-control-input" id="termsCheck" required>
 		<label class="custom-control-label terms" for="termsCheck">
diff --git a/files/templates/settings/security.html b/files/templates/settings/security.html
index fc18b12517..298bf8d0d0 100644
--- a/files/templates/settings/security.html
+++ b/files/templates/settings/security.html
@@ -63,13 +63,13 @@
 						</div>
 						<div class="d-lg-flex mt-5">
 							<label for="new_password" class="mb-0 w-lg-25">New Password</label>
-							<input autocomplete="off" class="form-control w-lg-100" id="new_password" type="password" name="new_password" required>
+							<input autocomplete="off" class="form-control w-lg-100" id="new_password" type="password" minlength="8" maxlength="100" name="new_password" required>
 							<small id="passwordHelpChange" class="form-text font-weight-bold text-muted d-none mt-1 w-lg-100">Minimum of 8 characters required.</small>
 							<small id="passwordHelpChangeSuccess" class="form-text font-weight-bold text-success d-none mt-1 w-lg-100">Your password meets the requirements.</small>
 						</div>
 						<div class="d-lg-flex mt-4">
 							<label for="cnf_password" class="mb-0 w-lg-25">Confirm New Password</label>
-							<input autocomplete="off" class="form-control w-lg-100" id="cnf_password" type="password" name="cnf_password" required>
+							<input autocomplete="off" class="form-control w-lg-100" id="cnf_password" type="password" minlength="8" maxlength="100" name="cnf_password" required>
 							<small id="passwordHelpCnf" class="form-text font-weight-bold text-muted d-none mt-1 w-lg-100">Passwords do not match.</small>
 							<small id="passwordHelpCnfSuccess" class="form-text font-weight-bold text-success d-none mt-1 w-lg-100">Passwords match.</small>
 						</div>