diff --git a/components/passwordStrengthBar.tsx b/components/passwordStrengthBar.tsx
new file mode 100644
index 00000000..b78bb721
--- /dev/null
+++ b/components/passwordStrengthBar.tsx
@@ -0,0 +1,60 @@
+"use client";
+
+import { calculatePasswordStrength } from "@/utils/passwordStrength";
+
+interface PasswordStrengthBarProps {
+  password: string;
+}
+
+export default function PasswordStrengthBar({
+  password,
+}: PasswordStrengthBarProps) {
+  const { score, label } = calculatePasswordStrength(password);
+
+  const colors = {
+    0: "bg-zinc-700",
+    1: "bg-red-500",
+    2: "bg-yellow-400",
+    3: "bg-lime-400",
+    4: "bg-green-500",
+  };
+
+  const textColors = {
+    0: "text-zinc-500",
+    1: "text-red-400",
+    2: "text-yellow-400",
+    3: "text-lime-400",
+    4: "text-green-400",
+  };
+
+  if (!password) return null;
+
+  return (
+    <div className="mt-2 space-y-1.5">
+      <div className="flex gap-1.5">
+        {[1, 2, 3, 4].map((bar) => (
+          <div
+            key={bar}
+            className={`h-1.5 flex-1 rounded-full transition-all duration-300 ${
+              bar <= score ? colors[score] : "bg-zinc-800"
+            }`}
+          />
+        ))}
+      </div>
+
+      <div className="flex items-center justify-between">
+        <span
+          className={`text-xs font-medium transition-colors duration-300 ${textColors[score]}`}
+        >
+          {label}
+        </span>
+
+        {score < 3 && (
+          <span className="text-xs text-zinc-400">
+            Use a stronger password
+          </span>
+        )}
+      </div>
+    </div>
+  );
+}
\ No newline at end of file
diff --git a/pages/forgot-password.tsx b/pages/forgot-password.tsx
index 1ab2fcf1..2ff84cdc 100644
--- a/pages/forgot-password.tsx
+++ b/pages/forgot-password.tsx
@@ -8,6 +8,8 @@ import Input from "@/components/input";
 import Button from "@/components/button";
 import { Dialog } from "@headlessui/react";
 import { IconX } from "@tabler/icons-react";
+import PasswordStrengthBar from "@/components/passwordStrengthBar";
+import { calculatePasswordStrength } from "@/utils/passwordStrength";
 
 type FormData = {
 	username: string;
@@ -35,7 +37,7 @@ function getAvatarBgColor(displayName: string): string {
 const ForgotPassword: NextPage = () => {
 	const [selectedSlide, setSelectedSlide] = useState(0);
 	const [code, setCode] = useState("");
-  const [userId, setUserId] = useState<string | null>(null);
+  	const [userId, setUserId] = useState<string | null>(null);
 	const [resetDisplayName, setResetDisplayName] = useState("");
 	const [resetThumbnail, setResetThumbnail] = useState("");
 	const [error, setError] = useState<string | null>(null);
@@ -53,6 +55,9 @@ const ForgotPassword: NextPage = () => {
 
 	const usernameForm = useForm<FormData>();
 	const passwordForm = useForm<ResetPasswordData>();
+	
+	const resetPassword = passwordForm.watch("password") || "";
+	const resetPasswordStrength = calculatePasswordStrength(resetPassword);
 
 	const startReset = async () => {
 		setError(null);
@@ -263,53 +268,82 @@ const ForgotPassword: NextPage = () => {
 							{selectedSlide === 3 && (
 								<>
 									<h2 className="text-xl font-semibold text-zinc-900 dark:text-white tracking-tight">
-										Set your new password
+									Set your new password
 									</h2>
+
 									<p className="mt-1 text-sm text-zinc-500 dark:text-zinc-400 mb-6">
-										Enter and confirm your new password.
+									Enter and confirm your new password.
 									</p>
+
 									{error && (
-										<p className="text-center text-red-500 text-sm mb-4">{error}</p>
+									<p className="text-center text-red-500 text-sm mb-4">
+										{error}
+									</p>
 									)}
+
 									<FormProvider {...passwordForm}>
-										<form className="space-y-4" onSubmit={passwordForm.handleSubmit(finishReset)}>
-											<Input
-												type="password"
-												{...passwordForm.register("password", { required: "You must enter a password" })}
-												label="New password"
-											/>
-											<Input
-												type="password"
-												{...passwordForm.register("verifypassword", {
-													required: "Please confirm your password",
-													validate: (value) =>
-														value === passwordForm.getValues("password") || "Passwords must match",
-												})}
-												label="Confirm password"
-											/>
-											<div className="flex gap-3 pt-1">
-												<Button
-													type="button"
-													classoverride="flex-1 px-5 py-2.5 text-sm font-medium rounded-xl bg-white dark:bg-zinc-800 border border-zinc-200 dark:border-zinc-600 text-zinc-600 dark:text-zinc-300 hover:bg-zinc-100 dark:hover:bg-zinc-700"
-													onPress={() => setSelectedSlide(2)}
-												>
-													Back
-												</Button>
+									<form
+										className="space-y-4"
+										onSubmit={passwordForm.handleSubmit(finishReset)}
+									>
+										<div>
+										<Input
+											type="password"
+											{...passwordForm.register("password", {
+											required: "You must enter a password",
+											validate: (value) => {
+												const { score } = calculatePasswordStrength(value);
+
+												return (
+												score >= 3 ||
+												"Your password must be at least Strong"
+												);
+											},
+											})}
+											label="New password"
+										/>
+
+										<PasswordStrengthBar password={resetPassword} />
+										</div>
+
+										<Input
+										type="password"
+										{...passwordForm.register("verifypassword", {
+											required: "Please confirm your password",
+											validate: (value) =>
+											value === passwordForm.getValues("password") ||
+											"Passwords must match",
+										})}
+										label="Confirm password"
+										/>
+
+										<div className="flex gap-3 pt-1">
+										<Button
+											type="button"
+											classoverride="flex-1 px-5 py-2.5 text-sm font-medium rounded-xl bg-white dark:bg-zinc-800 border border-zinc-200 dark:border-zinc-600 text-zinc-600 dark:text-zinc-300 hover:bg-zinc-100 dark:hover:bg-zinc-700"
+											onPress={() => setSelectedSlide(2)}
+										>
+											Back
+										</Button>
+
 										<Button
 											type="submit"
-											classoverride="flex-1 px-6 py-2.5 text-sm font-medium rounded-xl shadow-sm"
+											disabled={resetPasswordStrength.score < 3}
+											classoverride="flex-1 px-6 py-2.5 text-sm font-medium rounded-xl shadow-sm disabled:opacity-50 disabled:cursor-not-allowed"
 											workspace
 										>
 											Reset password
-												</Button>
-											</div>
-											<p className="mt-4 text-xs text-zinc-500 dark:text-zinc-400 text-center">
-												Don’t share your password. Don’t use the same password as your Roblox account.
-											</p>
-										</form>
+										</Button>
+										</div>
+
+										<p className="mt-4 text-xs text-zinc-500 dark:text-zinc-400 text-center">
+										Don’t share your password. Don’t use the same password as your
+										Roblox account.
+										</p>
+									</form>
 									</FormProvider>
 								</>
-							)}
+								)}
 						</div>
 					</div>
 				</div>
diff --git a/pages/login.tsx b/pages/login.tsx
index d42a646c..a7cd0255 100644
--- a/pages/login.tsx
+++ b/pages/login.tsx
@@ -22,6 +22,8 @@ import {
   sessionPrimaryButtonClass,
   sessionSecondaryButtonClass,
 } from "@/components/sessions/shell";
+import PasswordStrengthBar from "@/components/passwordStrengthBar";
+import { calculatePasswordStrength } from "@/utils/passwordStrength";
 
 const oauthButtonClass =
   "w-full flex items-center justify-center gap-2 rounded-xl bg-zinc-100 px-4 py-2.5 text-sm font-medium text-zinc-700 transition hover:bg-zinc-200 disabled:opacity-50 dark:bg-zinc-800 dark:text-zinc-200 dark:hover:bg-zinc-700";
@@ -166,7 +168,6 @@ const Login: NextPage = () => {
   const usernameCheckTimeout = useRef<NodeJS.Timeout | null>(null);
 
   const effectiveOAuthOnly = oauthOnly && isOAuthAvailable;
-
   useEffect(() => {
     loginMethods.reset();
     signupMethods.reset();
@@ -182,6 +183,9 @@ const Login: NextPage = () => {
     if (usernameCheckTimeout.current)
       clearTimeout(usernameCheckTimeout.current);
   }, [mode]);
+  
+  const signupPassword = signupMethods.watch("password") || "";
+  const passwordStrength = calculatePasswordStrength(signupPassword);
 
   useEffect(() => {
     let isMounted = true;
@@ -772,9 +776,11 @@ const Login: NextPage = () => {
                         <h2 className="text-lg font-semibold tracking-tight text-zinc-900 dark:text-white">
                           Set a password
                         </h2>
+
                         <p className="mt-1 text-sm text-zinc-500 dark:text-zinc-400">
                           Choose a secure password for your account.
                         </p>
+
                         <FormProvider {...signupMethods}>
                           <form
                             onSubmit={submitSignup(onSubmitSignup)}
@@ -791,16 +797,22 @@ const Login: NextPage = () => {
                                 required: "Password is required",
                                 minLength: {
                                   value: 7,
-                                  message:
-                                    "Password must be at least 7 characters",
+                                  message: "Password must be at least 7 characters",
                                 },
-                                pattern: {
-                                  value: /^(?=.*[0-9!@#$%^&*])/,
-                                  message:
-                                    "Password must contain at least one number or special character",
+                                validate: (value) => {
+                                  const { score } = calculatePasswordStrength(value);
+
+                                  if (score < 3) {
+                                    return "Password is not strong enough";
+                                  }
+
+                                  return true;
                                 },
                               })}
                             />
+
+                            <PasswordStrengthBar password={signupPassword} />
+
                             <Input
                               label="Verify password"
                               placeholder="Verify password"
@@ -814,6 +826,7 @@ const Login: NextPage = () => {
                                   "Passwords must match",
                               })}
                             />
+
                             <div className="flex gap-3 pt-4">
                               <button
                                 type="button"
@@ -826,14 +839,16 @@ const Login: NextPage = () => {
                               >
                                 Back
                               </button>
+
                               <AuthSubmitButton
                                 className="flex-1 justify-center"
                                 loading={loading}
-                                disabled={loading}
+                                disabled={loading || passwordStrength.score < 3}
                               >
                                 Continue
                               </AuthSubmitButton>
                             </div>
+
                             {(isRobloxOAuth ||
                               isDiscordOAuth ||
                               isGoogleOAuth) && (
@@ -842,6 +857,7 @@ const Login: NextPage = () => {
                                 <OAuthButtons />
                               </>
                             )}
+
                             <p className="mt-4 text-center text-xs text-zinc-400 dark:text-zinc-500">
                               Don&apos;t share your password. Don&apos;t use the
                               same password as your Roblox account.
diff --git a/pages/welcome.tsx b/pages/welcome.tsx
index aa5ffc26..7c10091b 100644
--- a/pages/welcome.tsx
+++ b/pages/welcome.tsx
@@ -10,6 +10,8 @@ import axios from "axios";
 import { toast } from "react-hot-toast";
 import { IconCheck, IconEye, IconEyeOff, IconInfoCircle, IconX } from "@tabler/icons-react";
 import { getContrastColor } from "@/utils/color";
+import PasswordStrengthBar from "@/components/passwordStrengthBar";
+import { calculatePasswordStrength } from "@/utils/passwordStrength";
 
 type FormData = {
   username: string;
@@ -33,6 +35,8 @@ const Login: NextPage = () => {
   const [ocLoading, setOcLoading] = useState(false);
   const [showApiKey, setShowApiKey] = useState(false);
   const testedKey = useRef<string | null>(null);
+  const signupPassword = signupform.watch("password") || "";
+  const signupPasswordStrength = calculatePasswordStrength(signupPassword);
 
   async function createAccount() {
     setIsLoading(true);
@@ -350,35 +354,52 @@ const Login: NextPage = () => {
 
             {!isRegistered && (
               <div>
-                <p className="font-bold text-2xl dark:text-white">Make your Orbit account</p>
+                <p className="font-bold text-2xl dark:text-white">
+                  Make your Orbit account
+                </p>
+
                 <p className="text-sm mt-1 text-zinc-500 dark:text-zinc-200">
                   You need to create an Orbit account to continue
                 </p>
+
                 <FormProvider {...signupform}>
-                  <form className="mt-4" onSubmit={signupform.handleSubmit(createAccount)}>
+                  <form
+                    className="mt-4"
+                    onSubmit={signupform.handleSubmit(createAccount)}
+                  >
                     <Input
                       {...signupform.register("username", {
-                        required: "Username is required"
+                        required: "Username is required",
                       })}
                       label="Roblox Username"
                     />
+
                     {signupform.formState.errors.username && (
                       <p className="text-red-500 text-sm mt-1">
                         {signupform.formState.errors.username.message}
                       </p>
                     )}
 
-                    <Input
-                      type="password"
-                      {...signupform.register("password", {
-                        required: "Password is required",
-                        minLength: {
-                          value: 8,
-                          message: "Password must be at least 8 characters"
-                        }
-                      })}
-                      label="Password"
-                    />
+                    <div className="mt-3">
+                      <Input
+                        type="password"
+                        {...signupform.register("password", {
+                          required: "Password is required",
+                          validate: (value) => {
+                            const { score } = calculatePasswordStrength(value);
+
+                            return (
+                              score >= 3 ||
+                              "Password must be at least Strong"
+                            );
+                          },
+                        })}
+                        label="Password"
+                      />
+
+                      <PasswordStrengthBar password={signupPassword} />
+                    </div>
+
                     {signupform.formState.errors.password && (
                       <p className="text-red-500 text-sm mt-1">
                         {signupform.formState.errors.password.message}
@@ -389,12 +410,13 @@ const Login: NextPage = () => {
                       type="password"
                       {...signupform.register("verifypassword", {
                         required: "Please verify your password",
-                        validate: value =>
-                          value === signupform.getValues('password') ||
-                          "Passwords do not match"
+                        validate: (value) =>
+                          value === signupform.getValues("password") ||
+                          "Passwords do not match",
                       })}
                       label="Verify password"
                     />
+
                     {signupform.formState.errors.verifypassword && (
                       <p className="text-red-500 text-sm mt-1">
                         {signupform.formState.errors.verifypassword.message}
@@ -411,14 +433,19 @@ const Login: NextPage = () => {
                   >
                     Back
                   </button>
+
                   <button
                     type="button"
                     onClick={signupform.handleSubmit(createAccount)}
-                    disabled={isLoading}
-                    className={`ml-auto py-2.5 text-sm rounded-xl px-6 text-white font-bold hover:bg-orbit/80 transition ${isLoading ? 'opacity-50 cursor-not-allowed' : ''}`}
+                    disabled={isLoading || signupPasswordStrength.score < 3}
+                    className={`ml-auto py-2.5 text-sm rounded-xl px-6 text-white font-bold hover:bg-orbit/80 transition ${
+                      isLoading || signupPasswordStrength.score < 3
+                        ? "opacity-50 cursor-not-allowed"
+                        : ""
+                    }`}
                     style={{ backgroundColor: selectedColor }}
                   >
-                    {isLoading ? 'Creating...' : 'Continue'}
+                    {isLoading ? "Creating..." : "Continue"}
                   </button>
                 </div>
               </div>
diff --git a/utils/passwordStrength.ts b/utils/passwordStrength.ts
new file mode 100644
index 00000000..eac09af1
--- /dev/null
+++ b/utils/passwordStrength.ts
@@ -0,0 +1,36 @@
+import zxcvbn from "zxcvbn";
+
+export type PasswordStrength = {
+  score: 0 | 1 | 2 | 3 | 4;
+  label: "Weak" | "Okay" | "Strong" | "Super Secure";
+};
+
+export function calculatePasswordStrength(
+  password: string,
+): PasswordStrength {
+  if (!password) {
+    return {
+      score: 0,
+      label: "Weak",
+    };
+  }
+
+  const result = zxcvbn(password);
+  const score = result.score as 0 | 1 | 2 | 3 | 4;
+
+  const labels: Record<
+    0 | 1 | 2 | 3 | 4,
+    PasswordStrength["label"]
+  > = {
+    0: "Weak",
+    1: "Weak",
+    2: "Okay",
+    3: "Strong",
+    4: "Super Secure",
+  };
+
+  return {
+    score,
+    label: labels[score],
+  };
+}
\ No newline at end of file