diff --git a/core/designsystem/src/main/java/com/twofasapp/designsystem/common/TwOutlinedTextField.kt b/core/designsystem/src/main/java/com/twofasapp/designsystem/common/TwOutlinedTextField.kt
index d153bb66..a771b733 100644
--- a/core/designsystem/src/main/java/com/twofasapp/designsystem/common/TwOutlinedTextField.kt
+++ b/core/designsystem/src/main/java/com/twofasapp/designsystem/common/TwOutlinedTextField.kt
@@ -22,6 +22,8 @@ import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.TextRange
 import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.input.VisualTransformation
@@ -146,7 +148,11 @@ fun TwOutlinedTextFieldPassword(
         labelText = labelText,
         supportingText = supportingText,
         isError = isError,
-        keyboardOptions = keyboardOptions,
+        keyboardOptions = keyboardOptions.copy(
+            keyboardType = KeyboardType.Password,
+            capitalization = KeyboardCapitalization.None,
+            autoCorrect = false
+        ),
         keyboardActions = keyboardActions,
         singleLine = singleLine,
         maxLines = maxLines,
diff --git a/feature/home/src/main/java/com/twofasapp/feature/home/ui/editservice/EditServiceScreen.kt b/feature/home/src/main/java/com/twofasapp/feature/home/ui/editservice/EditServiceScreen.kt
index c9fefe6b..09ef7e01 100644
--- a/feature/home/src/main/java/com/twofasapp/feature/home/ui/editservice/EditServiceScreen.kt
+++ b/feature/home/src/main/java/com/twofasapp/feature/home/ui/editservice/EditServiceScreen.kt
@@ -158,7 +158,8 @@ internal fun EditServiceScreen(
                         onValueChange = {},
                         keyboardOptions = KeyboardOptions.Default.copy(
                             keyboardType = KeyboardType.Password,
-                            capitalization = KeyboardCapitalization.None
+                            capitalization = KeyboardCapitalization.None,
+                            autoCorrect = false
                         ),
                         visualTransformation = if (isSecretVisible) VisualTransformation.None else PasswordVisualTransformation(),
                         trailingIcon = {