diff --git a/src/app/auth/component/component.tsx b/src/app/auth/component/component.tsx
index cb98844..0f32c2d 100644
--- a/src/app/auth/component/component.tsx
+++ b/src/app/auth/component/component.tsx
@@ -175,6 +175,8 @@ export function Component( props : Props) {
                 id="remember-me"
                 name="remember-me"
                 className="h-4 w-4 rounded text-primary focus:ring-primary"
+                checked
+                disabled
               />
               <Label htmlFor="remember-me" className="ml-2 block text-sm text-foreground">
                 Remember me
diff --git a/src/app/auth/update_password/page.tsx b/src/app/auth/update_password/page.tsx
index b64c9b4..6c1073e 100644
--- a/src/app/auth/update_password/page.tsx
+++ b/src/app/auth/update_password/page.tsx
@@ -21,6 +21,7 @@ export default function Update_password() {
     setLoading(true)
     if( e.currentTarget.password.value !== e.currentTarget.confirmPassword.value ) {
       setErrorMsg("Passwords do not match")
+      setLoading(false)
       return
     }
     const { error } = await supabase.auth.updateUser({
diff --git a/src/utils/supabase/middleware.ts b/src/utils/supabase/middleware.ts
index 5d1d5fb..78bb836 100644
--- a/src/utils/supabase/middleware.ts
+++ b/src/utils/supabase/middleware.ts
@@ -63,7 +63,7 @@ export async function updateSession(request: NextRequest) {
   let { data: {user}, error} = await supabase.auth.getUser()
 
   
-  if (user && (request.nextUrl.pathname === '/auth/confirm_email' || request.nextUrl.pathname === '/auth')) {
+  if (user && (request.nextUrl.pathname === '/auth/confirm_email' || request.nextUrl.pathname === '/auth' || request.nextUrl.pathname === '/auth/reset_password')) {
     response = NextResponse.redirect(new URL('/form_create', request.nextUrl.href))
   } else if (!user && ( request.nextUrl.pathname === '/form_create' )) {
     response = NextResponse.redirect(new URL('/auth', request.nextUrl.href))