diff --git a/apps/mobile/src/components/common/SafeNavigationScrollView.tsx b/apps/mobile/src/components/common/SafeNavigationScrollView.tsx
index 64074170d..f7b3ca2c0 100644
--- a/apps/mobile/src/components/common/SafeNavigationScrollView.tsx
+++ b/apps/mobile/src/components/common/SafeNavigationScrollView.tsx
@@ -190,7 +190,7 @@ export const NavigationBlurEffectHeader = ({
                   </View>
 
                   <Header title={options.title ?? ""} {...options} headerBackground={() => null} />
-                  {hideableBottom && (
+                  {!!hideableBottom && (
                     <View
                       ref={setHideableBottomRef as any}
                       onLayout={(e) => {
diff --git a/apps/renderer/src/modules/auth/Form.tsx b/apps/renderer/src/modules/auth/Form.tsx
index 542ac068f..465f65343 100644
--- a/apps/renderer/src/modules/auth/Form.tsx
+++ b/apps/renderer/src/modules/auth/Form.tsx
@@ -23,7 +23,7 @@ import { TOTPForm } from "../profile/two-factor"
 
 const formSchema = z.object({
   email: z.string().email(),
-  password: z.string().max(128),
+  password: z.string().min(8).max(128),
 })
 
 export function LoginWithPassword({ runtime }: { runtime: LoginRuntime }) {
@@ -101,6 +101,7 @@ export function LoginWithPassword({ runtime }: { runtime: LoginRuntime }) {
                   href={`${env.VITE_WEB_URL}/forget-password`}
                   target="_blank"
                   rel="noreferrer"
+                  tabIndex={-1}
                   className="block py-1 text-xs text-accent hover:underline"
                 >
                   {t("login.forget_password.note")}
@@ -113,29 +114,29 @@ export function LoginWithPassword({ runtime }: { runtime: LoginRuntime }) {
             </FormItem>
           )}
         />
-        <Button
-          type="submit"
-          buttonClassName="!mt-3 w-full"
-          isLoading={form.formState.isSubmitting}
-          size="lg"
-        >
-          {t("login.continueWith", { provider: t("words.email") })}
-        </Button>
-        <Button
-          buttonClassName="!mt-3"
-          className="w-full"
-          variant="outline"
-          size="lg"
-          onClick={() => {
-            dismiss()
-            present({
-              content: RegisterForm,
-              title: t("register.label", { app_name: APP_NAME }),
-            })
-          }}
-        >
-          {t("login.signUp")}
-        </Button>
+        <div className="flex flex-col space-y-3">
+          <Button
+            type="submit"
+            isLoading={form.formState.isSubmitting}
+            disabled={!form.formState.isValid}
+            size="lg"
+          >
+            {t("login.continueWith", { provider: t("words.email") })}
+          </Button>
+          <Button
+            variant="outline"
+            size="lg"
+            onClick={() => {
+              dismiss()
+              present({
+                content: RegisterForm,
+                title: t("register.label", { app_name: APP_NAME }),
+              })
+            }}
+          >
+            {t("login.signUp")}
+          </Button>
+        </div>
       </form>
     </Form>
   )
diff --git a/apps/renderer/src/modules/auth/LoginModalContent.tsx b/apps/renderer/src/modules/auth/LoginModalContent.tsx
index 67b3d43ce..2cc0be0fd 100644
--- a/apps/renderer/src/modules/auth/LoginModalContent.tsx
+++ b/apps/renderer/src/modules/auth/LoginModalContent.tsx
@@ -66,7 +66,7 @@ export const LoginModalContent = (props: LoginModalContentProps) => {
               .filter(([key]) => key !== "credential")
               .map(([key, provider]) => (
                 <Tooltip key={key} delayDuration={0}>
-                  <TooltipTrigger>
+                  <TooltipTrigger asChild>
                     <MotionButtonBase
                       onClick={() => {
                         loginHandler(key, "app")
@@ -110,7 +110,7 @@ export const LoginModalContent = (props: LoginModalContentProps) => {
         exit={{ opacity: 0, y: 10, transition: { type: "tween" } }}
         transition={{ type: "spring" }}
       >
-        <div className="rounded-xl border bg-background p-3 px-8 shadow-2xl shadow-stone-300 dark:border-neutral-700 dark:shadow-stone-800">
+        <div className="w-[25rem] rounded-xl border bg-background p-3 px-8 shadow-2xl shadow-stone-300 dark:border-neutral-700 dark:shadow-stone-800">
           {Inner}
         </div>
       </m.div>