diff --git a/website/assets/js/pages/customers/dashboard.page.js b/website/assets/js/pages/customers/dashboard.page.js
index f209f46f2f..d957fc038a 100644
--- a/website/assets/js/pages/customers/dashboard.page.js
+++ b/website/assets/js/pages/customers/dashboard.page.js
@@ -62,7 +62,14 @@ parasails.registerPage('dashboard', {
       this.formData = {};
       this.formRules = {
         oldPassword: {required: true},
-        newPassword: {required: true, minLength: 8},
+        newPassword: {
+          required: true,
+          minLength: 12,
+          maxLength: 48,
+          custom: (value)=>{
+            return value.match(/^(?=.*\d)(?=.*[^A-Za-z0-9]).{12,48}$/);
+          }
+        },
       };
       this.modal = 'update-password';
     },
diff --git a/website/assets/js/pages/entrance/new-password.page.js b/website/assets/js/pages/entrance/new-password.page.js
index 0b934c8326..9d98eb90fe 100644
--- a/website/assets/js/pages/entrance/new-password.page.js
+++ b/website/assets/js/pages/entrance/new-password.page.js
@@ -15,8 +15,20 @@ parasails.registerPage('new-password', {
 
     // Form rules
     formRules: {
-      password: {required: true, minLength: 8},
-      confirmPassword: {required: true, minLength: 8, sameAs: 'password'},
+      password: {
+        required: true,
+        minLength: 12,
+        maxLength: 48,
+        custom: (value)=>{
+          return value.match(/^(?=.*\d)(?=.*[^A-Za-z0-9]).{12,48}$/);
+        }
+      },
+      confirmPassword: {
+        required: true,
+        minLength: 12,
+        maxLength: 48,
+        sameAs: 'password',
+      },
     },
 
     // Server error state for the form
diff --git a/website/assets/styles/pages/498.less b/website/assets/styles/pages/498.less
index 45b3803777..c96d8a04eb 100644
--- a/website/assets/styles/pages/498.less
+++ b/website/assets/styles/pages/498.less
@@ -1,5 +1,7 @@
 [id='498'] {
 
-  //…
+  a.btn:hover {
+    color: #FFF;
+  }
 
 }
diff --git a/website/views/498.ejs b/website/views/498.ejs
index d84f0eba9a..3cdc8ddaf4 100644
--- a/website/views/498.ejs
+++ b/website/views/498.ejs
@@ -4,7 +4,7 @@
     <hr/>
     <div>
       <p>Need further help accessing your account?<br class="d-none d-sm-inline" /><span class="d-inline d-sm-none">&nbsp;</span>Please <a href="/contact?sendMessage">contact support</a> or request a new <a href="/customers/forgot-password">password reset.</a></p>
-      <a class="btn btn-info" href="/customers/forgot-password">Reset password</a>
+      <a class="btn btn-primary" href="/customers/forgot-password">Reset password</a>
     </div>
   </div>
 </div>
diff --git a/website/views/layouts/layout.ejs b/website/views/layouts/layout.ejs
index ee209b02f6..0d04f3a8f2 100644
--- a/website/views/layouts/layout.ejs
+++ b/website/views/layouts/layout.ejs
@@ -929,8 +929,8 @@
     <script src="/js/pages/landing-pages/basic-comparison.page.js"></script>
     <script src="/js/pages/landing-pages/deployment.page.js"></script>
     <script src="/js/pages/landing-pages/gitops-workshop.page.js"></script>
-    <script src="/js/pages/landing-pages/replace-jamf.page.js"></script>
     <script src="/js/pages/landing-pages/linux-management.page.js"></script>
+    <script src="/js/pages/landing-pages/replace-jamf.page.js"></script>
     <script src="/js/pages/legal/privacy.page.js"></script>
     <script src="/js/pages/legal/terms.page.js"></script>
     <script src="/js/pages/meetups.page.js"></script>
diff --git a/website/views/pages/customers/dashboard.ejs b/website/views/pages/customers/dashboard.ejs
index bd3cc81342..a1c10a5be7 100644
--- a/website/views/pages/customers/dashboard.ejs
+++ b/website/views/pages/customers/dashboard.ejs
@@ -181,21 +181,23 @@
         <div class="modal-body">
           <div class="form-group">
             <label for="oldPassword">Current password</label>
-            <input class="form-control" type="password" id="oldPassword" :class="[formErrors.oldPassword ? 'is-invalid' : '']" v-model.trim="formData.oldPassword" autocomplete="password">
+            <input class="form-control" type="password" id="oldPassword" :class="[formErrors.oldPassword ? 'is-invalid' : '']" v-model.trim="formData.oldPassword" autocomplete="password" focus-first>
             <div class="invalid-feedback" v-if="formErrors.oldPassword">Please enter your current password.</div>
           </div>
           <div class="form-group">
             <label for="password">New password</label>
             <input class="form-control" type="password" id="password" :class="[formErrors.newPassword ? 'is-invalid' : '']" v-model.trim="formData.newPassword">
             <div class="invalid-feedback" v-if="formErrors.newPassword === 'minLength'">Password too short!</div>
-            <div class="invalid-feedback" v-else-if="formErrors.newPassword">Please enter your new password.</div>
-            <p class="mt-2"> Minimum length is 8 characters</p>
+            <div class="invalid-feedback" v-else-if="formErrors.newPassword === 'maxLength'">Password too long!</div>
+            <div class="invalid-feedback" v-else-if="formErrors.newPassword === 'custom'">New password does not meet requirements.</div>
+            <div class="invalid-feedback" v-else-if="formErrors.newPassword === 'required'">Please enter your new password.</div>
+            <p class="mt-2">Passwords must be 12-48 characters, with at least 1 number (e.g. 0 - 9) and 1 symbol (e.g. &*#).</p>
           </div>
           <cloud-error v-if="cloudError === 'badPassword'">Incorrect current password.</cloud-error>
           <cloud-error v-else-if="cloudError"></cloud-error>
         </div>
         <div class="border-0 justify-content-center">
-          <ajax-button purpose="submit-button" spinner="true" type="submit" :syncing="syncing" class="btn btn-sm btn-block btn-info" focus-first>Save</ajax-button>
+          <ajax-button purpose="submit-button" spinner="true" type="submit" :syncing="syncing" class="btn btn-sm btn-primary" >Save</ajax-button>
         </div>
       </ajax-form>
     </div>
diff --git a/website/views/pages/entrance/new-password.ejs b/website/views/pages/entrance/new-password.ejs
index a5894dfbc6..e543f4555b 100644
--- a/website/views/pages/entrance/new-password.ejs
+++ b/website/views/pages/entrance/new-password.ejs
@@ -9,16 +9,20 @@
             <input class="form-control" id="password" name="password" type="password"  :class="[formErrors.password ? 'is-invalid' : '']" v-model.trim="formData.password" autocomplete="new-password" focus-first>
             <div class="invalid-feedback" v-if="formErrors.password === 'required'">Please enter a password.</div>
             <div class="invalid-feedback" v-if="formErrors.password === 'minLength'">Password too short.</div>
-            <p class="mt-2"> Minimum length is 8 characters</p>
+            <div class="invalid-feedback" v-if="formErrors.password === 'maxLength'">Password too long.</div>
+            <div class="invalid-feedback" v-if="formErrors.password === 'custom'">Password does not meet requirements.</div>
+            <p purpose="modal-form-note" class="mt-2">Passwords must be 12-48 characters, with at least 1 number (e.g. 0 - 9) and 1 symbol (e.g. &*#).</p>
           </div>
           <div class="form-group">
             <label for="confirm-password">Confirm password</label>
             <input class="form-control" id="confirm-password" name="confirm-password" type="password"  :class="[formErrors.confirmPassword ? 'is-invalid' : '']" v-model.trim="formData.confirmPassword" autocomplete="new-password">
             <div class="invalid-feedback" v-if="formErrors.password === 'minLength'">Password too short.</div>
-            <div class="invalid-feedback" v-if="formErrors.confirmPassword">Your new password and confirmation do not match.</div>
+            <div class="invalid-feedback" v-if="formErrors.password === 'custom'">Password does not meet requirements.</div>
+            <div class="invalid-feedback" v-if="formErrors.confirmPassword === 'sameAs'">Your new password and confirmation do not match.</div>
+
           </div>
           <cloud-error v-if="cloudError"></cloud-error>
-          <ajax-button purpose="submit-button" spinner="true" type="submit" :syncing="syncing" class="btn btn-info btn-lg btn-block">Submit</ajax-button>
+          <ajax-button purpose="submit-button" spinner="true" type="submit" :syncing="syncing" class="btn btn-primary">Submit</ajax-button>
         </ajax-form>
       </div>
     </div>