diff --git a/apps/openpage-api/app/growth/total-users/route.ts b/apps/openpage-api/app/growth/total-users/route.ts
index 0617ecda2..bd34055ef 100644
--- a/apps/openpage-api/app/growth/total-users/route.ts
+++ b/apps/openpage-api/app/growth/total-users/route.ts
@@ -2,7 +2,7 @@ import cors from '@/lib/cors';
 import { getUserMonthlyGrowth } from '@/lib/growth/get-user-monthly-growth';
 
 export async function GET(request: Request) {
-  const totalUsers = await getUserMonthlyGrowth("cumulative");
+  const totalUsers = await getUserMonthlyGrowth('cumulative');
 
   return cors(
     request,
diff --git a/apps/openpage-api/lib/cors.ts b/apps/openpage-api/lib/cors.ts
index 03c1f1c4a..2d667ab23 100644
--- a/apps/openpage-api/lib/cors.ts
+++ b/apps/openpage-api/lib/cors.ts
@@ -30,10 +30,10 @@ function isOriginAllowed(origin: string, allowed: StaticOrigin): boolean {
   return Array.isArray(allowed)
     ? allowed.some((o) => isOriginAllowed(origin, o))
     : typeof allowed === 'string'
-    ? origin === allowed
-    : allowed instanceof RegExp
-    ? allowed.test(origin)
-    : !!allowed;
+      ? origin === allowed
+      : allowed instanceof RegExp
+        ? allowed.test(origin)
+        : !!allowed;
 }
 
 function getOriginHeaders(reqOrigin: string | undefined, origin: StaticOrigin) {
diff --git a/apps/web/src/app/(signing)/sign/[token]/dropdown-field.tsx b/apps/web/src/app/(signing)/sign/[token]/dropdown-field.tsx
index ccc7df777..eef159ec6 100644
--- a/apps/web/src/app/(signing)/sign/[token]/dropdown-field.tsx
+++ b/apps/web/src/app/(signing)/sign/[token]/dropdown-field.tsx
@@ -178,7 +178,7 @@ export const DropdownField = ({
         )}
 
         {!field.inserted && (
-          <p className="group-hover:text-primary text-muted-foreground flex flex-col items-center justify-center duration-200 ">
+          <p className="group-hover:text-primary text-muted-foreground flex flex-col items-center justify-center duration-200">
             <Select value={localChoice} onValueChange={handleSelectItem}>
               <SelectTrigger
                 className={cn(
diff --git a/apps/web/src/app/(signing)/sign/[token]/name-field.tsx b/apps/web/src/app/(signing)/sign/[token]/name-field.tsx
index fdf5fbbee..ce39af972 100644
--- a/apps/web/src/app/(signing)/sign/[token]/name-field.tsx
+++ b/apps/web/src/app/(signing)/sign/[token]/name-field.tsx
@@ -205,7 +205,7 @@ export const NameField = ({ field, recipient, onSignField, onUnsignField }: Name
             <div className="flex w-full flex-1 flex-nowrap gap-4">
               <Button
                 type="button"
-                className="dark:bg-muted dark:hover:bg-muted/80 flex-1  bg-black/5 hover:bg-black/10"
+                className="dark:bg-muted dark:hover:bg-muted/80 flex-1 bg-black/5 hover:bg-black/10"
                 variant="secondary"
                 onClick={() => {
                   setShowFullNameModal(false);
diff --git a/apps/web/src/app/(signing)/sign/[token]/number-field.tsx b/apps/web/src/app/(signing)/sign/[token]/number-field.tsx
index 40d000700..9461900c9 100644
--- a/apps/web/src/app/(signing)/sign/[token]/number-field.tsx
+++ b/apps/web/src/app/(signing)/sign/[token]/number-field.tsx
@@ -318,7 +318,7 @@ export const NumberField = ({ field, recipient, onSignField, onUnsignField }: Nu
             <div className="flex w-full flex-1 flex-nowrap gap-4">
               <Button
                 type="button"
-                className="dark:bg-muted dark:hover:bg-muted/80 flex-1  bg-black/5 hover:bg-black/10"
+                className="dark:bg-muted dark:hover:bg-muted/80 flex-1 bg-black/5 hover:bg-black/10"
                 variant="secondary"
                 onClick={() => {
                   setShowRadioModal(false);
diff --git a/apps/web/src/app/(signing)/sign/[token]/text-field.tsx b/apps/web/src/app/(signing)/sign/[token]/text-field.tsx
index 1ad14ff1b..fc722f8d0 100644
--- a/apps/web/src/app/(signing)/sign/[token]/text-field.tsx
+++ b/apps/web/src/app/(signing)/sign/[token]/text-field.tsx
@@ -214,15 +214,15 @@ export const TextField = ({ field, recipient, onSignField, onUnsignField }: Text
     parsedField?.label && parsedField.label.length < 20
       ? parsedField.label
       : parsedField?.label
-      ? parsedField?.label.substring(0, 20) + '...'
-      : undefined;
+        ? parsedField?.label.substring(0, 20) + '...'
+        : undefined;
 
   const textDisplay =
     parsedField?.text && parsedField.text.length < 20
       ? parsedField.text
       : parsedField?.text
-      ? parsedField?.text.substring(0, 20) + '...'
-      : undefined;
+        ? parsedField?.text.substring(0, 20) + '...'
+        : undefined;
 
   const fieldDisplayName = labelDisplay ? labelDisplay : textDisplay;
   const charactersRemaining = (parsedFieldMeta?.characterLimit ?? 0) - (localText.length ?? 0);
@@ -325,7 +325,7 @@ export const TextField = ({ field, recipient, onSignField, onUnsignField }: Text
             <div className="mt-4 flex w-full flex-1 flex-nowrap gap-4">
               <Button
                 type="button"
-                className="dark:bg-muted dark:hover:bg-muted/80 flex-1  bg-black/5 hover:bg-black/10"
+                className="dark:bg-muted dark:hover:bg-muted/80 flex-1 bg-black/5 hover:bg-black/10"
                 variant="secondary"
                 onClick={() => {
                   setShowCustomTextModal(false);
diff --git a/apps/web/src/components/(dashboard)/avatar/stack-avatar.tsx b/apps/web/src/components/(dashboard)/avatar/stack-avatar.tsx
index 94f3e5a68..beafbebd5 100644
--- a/apps/web/src/components/(dashboard)/avatar/stack-avatar.tsx
+++ b/apps/web/src/components/(dashboard)/avatar/stack-avatar.tsx
@@ -47,10 +47,7 @@ export const StackAvatar = ({ first, zIndex, fallbackText = '', type }: StackAva
 
   return (
     <Avatar
-      className={`
-        ${zIndexClass}
-        ${firstClass}
-        dark:border-border h-10 w-10 border-2 border-solid border-white`}
+      className={` ${zIndexClass} ${firstClass} dark:border-border h-10 w-10 border-2 border-solid border-white`}
     >
       <AvatarFallback className={classes}>{fallbackText}</AvatarFallback>
     </Avatar>
diff --git a/apps/web/src/components/forms/v2/signup.tsx b/apps/web/src/components/forms/v2/signup.tsx
index 7c7c5d4d8..d67e09806 100644
--- a/apps/web/src/components/forms/v2/signup.tsx
+++ b/apps/web/src/components/forms/v2/signup.tsx
@@ -70,6 +70,7 @@ export const ZSignUpFormV2Schema = z
     },
     {
       message: msg`Password should not be common or based on personal information`.id,
+      path: ['password'],
     },
   );
 
diff --git a/packages/trpc/server/auth-router/schema.ts b/packages/trpc/server/auth-router/schema.ts
index 1f361ff37..a55a3f562 100644
--- a/packages/trpc/server/auth-router/schema.ts
+++ b/packages/trpc/server/auth-router/schema.ts
@@ -10,14 +10,20 @@ export const ZCurrentPasswordSchema = z
 
 export const ZPasswordSchema = z
   .string()
-  .regex(new RegExp('.*[A-Z].*'), { message: 'One uppercase character' })
-  .regex(new RegExp('.*[a-z].*'), { message: 'One lowercase character' })
-  .regex(new RegExp('.*\\d.*'), { message: 'One number' })
-  .regex(new RegExp('.*[`~<>?,./!@#$%^&*()\\-_+="\'|{}\\[\\];:\\\\].*'), {
-    message: 'One special character is required',
-  })
   .min(8, { message: 'Must be at least 8 characters in length' })
-  .max(72, { message: 'Cannot be more than 72 characters in length' });
+  .max(72, { message: 'Cannot be more than 72 characters in length' })
+  .refine((value) => value.length > 25 || /[A-Z]/.test(value), {
+    message: 'One uppercase character',
+  })
+  .refine((value) => value.length > 25 || /[a-z]/.test(value), {
+    message: 'One lowercase character',
+  })
+  .refine((value) => value.length > 25 || /\d/.test(value), {
+    message: 'One number',
+  })
+  .refine((value) => value.length > 25 || /[`~<>?,./!@#$%^&*()\-_"'+=|{}[\];:\\]/.test(value), {
+    message: 'One special character is required',
+  });
 
 export const ZSignUpMutationSchema = z.object({
   name: z.string().min(1),
diff --git a/packages/ui/primitives/document-flow/add-fields.tsx b/packages/ui/primitives/document-flow/add-fields.tsx
index 4300a95a3..287e53039 100644
--- a/packages/ui/primitives/document-flow/add-fields.tsx
+++ b/packages/ui/primitives/document-flow/add-fields.tsx
@@ -1086,8 +1086,8 @@ export const AddFieldsFormPartial = ({
                     {emptyCheckboxFields.length > 0
                       ? 'Checkbox'
                       : emptyRadioFields.length > 0
-                      ? 'Radio'
-                      : 'Select'}{' '}
+                        ? 'Radio'
+                        : 'Select'}{' '}
                     field.
                   </Trans>
                 </li>