diff --git a/src/screens/Login/LoginForm.tsx b/src/screens/Login/LoginForm.tsx
index 0d8c1b9668..212059986e 100644
--- a/src/screens/Login/LoginForm.tsx
+++ b/src/screens/Login/LoginForm.tsx
@@ -232,11 +232,10 @@ export const LoginForm = ({
               label={_(msg`Password`)}
               autoCapitalize="none"
               autoCorrect={false}
-              autoComplete="password"
+              autoComplete="current-password"
               returnKeyType="done"
               enablesReturnKeyAutomatically={true}
               secureTextEntry={true}
-              textContentType="password"
               clearButtonMode="while-editing"
               onChangeText={v => {
                 passwordValueRef.current = v
diff --git a/src/screens/Login/SetNewPasswordForm.tsx b/src/screens/Login/SetNewPasswordForm.tsx
index be72b558bc..1bcc588011 100644
--- a/src/screens/Login/SetNewPasswordForm.tsx
+++ b/src/screens/Login/SetNewPasswordForm.tsx
@@ -147,10 +147,10 @@ export const SetNewPasswordForm = ({
             label={_(msg`Enter a password`)}
             autoCapitalize="none"
             autoCorrect={false}
-            autoComplete="password"
             returnKeyType="done"
             secureTextEntry={true}
-            textContentType="password"
+            autoComplete="new-password"
+            passwordRules="minlength: 8;"
             clearButtonMode="while-editing"
             value={password}
             onChangeText={setPassword}
diff --git a/src/screens/Settings/components/ChangePasswordDialog.tsx b/src/screens/Settings/components/ChangePasswordDialog.tsx
index 4b09dffa65..463aa2fbe2 100644
--- a/src/screens/Settings/components/ChangePasswordDialog.tsx
+++ b/src/screens/Settings/components/ChangePasswordDialog.tsx
@@ -211,6 +211,7 @@ function Inner() {
                   secureTextEntry
                   autoCapitalize="none"
                   autoComplete="new-password"
+                  passwordRules="minlength: 8;"
                 />
               </TextField.Root>
             </View>