diff --git a/website/assets/js/components/signup-modal.component.js b/website/assets/js/components/signup-modal.component.js
index f0c6de1d03..9d4bad4434 100644
--- a/website/assets/js/components/signup-modal.component.js
+++ b/website/assets/js/components/signup-modal.component.js
@@ -35,7 +35,14 @@ parasails.registerComponent('signupModal', {
         firstName: {required: true},
         lastName: {required: true},
         emailAddress: {required: true, isEmail: true},
-        password: {required: true, minLength: 8},
+        password: {
+          required: true,
+          minLength: 12,
+          maxLength: 48,
+          custom: (value)=>{
+            return value.match(/^(?=.*\d)(?=.*[^A-Za-z0-9]).{12,48}$/);
+          }
+        },
       },
       // Login form
       loginFormData: {},
@@ -89,8 +96,10 @@ parasails.registerComponent('signupModal', {
               <label purpose="modal-form-label" for="password">Choose a password *</label>
               <input tabindex="2" purpose="modal-form-input" class="form-control" id="password" type="password"  :class="[signupFormErrors.password ? 'is-invalid' : '']" v-model.trim="signupFormData.password" autocomplete="new-password" @input="typeClearOneFormError('password')">
               <div class="invalid-feedback" v-if="signupFormErrors.password === 'minLength'">Password too short.</div>
+              <div class="invalid-feedback" v-if="signupFormErrors.password === 'maxLength'">Password too long.</div>
+              <div class="invalid-feedback" v-if="signupFormErrors.password === 'custom'">Password does not meet requirements.</div>
               <div class="invalid-feedback" v-if="signupFormErrors.password === 'required'">Please enter a password.</div>
-              <p purpose="modal-form-note" class="mt-2"> Minimum length is 8 characters</p>
+              <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="row">
               <div class="col-12 col-sm-6 pr-sm-2">
diff --git a/website/assets/js/pages/entrance/signup.page.js b/website/assets/js/pages/entrance/signup.page.js
index b9bcbf3f91..9a4dfe641f 100644
--- a/website/assets/js/pages/entrance/signup.page.js
+++ b/website/assets/js/pages/entrance/signup.page.js
@@ -16,7 +16,14 @@ parasails.registerPage('signup', {
       lastName: {required: true},
       // organization: {required: true},
       emailAddress: {required: true, isEmail: true},
-      password: {required: true, minLength: 8},
+      password: {
+        required: true,
+        minLength: 12,
+        maxLength: 48,
+        custom: (value)=>{
+          return value.match(/^(?=.*\d)(?=.*[^A-Za-z0-9]).{12,48}$/);
+        }
+      },
     },
     // Syncing / loading state
     syncing: false,
diff --git a/website/scripts/manage-fleet-premium-trial-instances.js b/website/scripts/manage-fleet-premium-trial-instances.js
index 3d27e3ef4a..81da4a1e5c 100644
--- a/website/scripts/manage-fleet-premium-trial-instances.js
+++ b/website/scripts/manage-fleet-premium-trial-instances.js
@@ -425,6 +425,7 @@ module.exports = {
           { key: 'FLEET_EMAIL_BACKEND', value: 'ses'},
           { key: 'FLEET_SES_REGION', value: 'us-east-2'},
           { key: 'FLEET_SES_SOURCE_ARN', value: `arn:aws:ses:us-east-2:564445215450:identity/${povRecord.slug}.try.fleetdm.com`},
+          { key: 'FLEET_SESSION_DURATION', value: '720h'},
         ];
 
         //
diff --git a/website/views/pages/entrance/signup.ejs b/website/views/pages/entrance/signup.ejs
index a857751127..f18e2d9eda 100644
--- a/website/views/pages/entrance/signup.ejs
+++ b/website/views/pages/entrance/signup.ejs
@@ -24,8 +24,10 @@
                 <label for="password">Choose a password *</label>
                 <input tabindex="2" class="form-control" id="password" type="password"  :class="[formErrors.password ? 'is-invalid' : '']" v-model.trim="formData.password" autocomplete="new-password" @input="typeClearOneFormError('password')">
                 <div class="invalid-feedback" v-if="formErrors.password === 'minLength'">Password too short.</div>
+                <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>
                 <div class="invalid-feedback" v-if="formErrors.password === 'required'">Please enter a password.</div>
-                <p class="mt-2 small"> Minimum length is 8 characters</p>
+                <p class="mt-2 small">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="organization">Organization *</label>