diff --git a/app/src/main/kotlin/de/justjanne/quasseldroid/ui/components/LoginView.kt b/app/src/main/kotlin/de/justjanne/quasseldroid/ui/components/LoginView.kt
index d3e6aa05ed3b1597a8bb5bfa8348da5fcd00ad04..ae3016eecbe243ca88e99344e8d01108a23daad3 100644
--- a/app/src/main/kotlin/de/justjanne/quasseldroid/ui/components/LoginView.kt
+++ b/app/src/main/kotlin/de/justjanne/quasseldroid/ui/components/LoginView.kt
@@ -17,6 +17,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusDirection
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -101,7 +103,12 @@ fun LoginView(
         .fillMaxWidth()
         .handleTabFocus(focusManager),
       label = { Text("Password") },
-      keyboardOptions = KeyboardOptions.Default.copy(imeAction = ImeAction.Next),
+      keyboardOptions = KeyboardOptions.Default.copy(
+        keyboardType = KeyboardType.Password,
+        autoCorrect = false,
+        capitalization = KeyboardCapitalization.None,
+        imeAction = ImeAction.Next
+      ),
       keyboardActions = KeyboardActions(onNext = {
         focusManager.moveFocus(FocusDirection.Down)
       }),
diff --git a/app/src/main/kotlin/de/justjanne/quasseldroid/ui/components/PasswordTextField.kt b/app/src/main/kotlin/de/justjanne/quasseldroid/ui/components/PasswordTextField.kt
index ac3c389fcc6379ee141522c1cd5447f2674757a2..3e4d10bec04354b82c097d5359b42cbc4d24fedd 100644
--- a/app/src/main/kotlin/de/justjanne/quasseldroid/ui/components/PasswordTextField.kt
+++ b/app/src/main/kotlin/de/justjanne/quasseldroid/ui/components/PasswordTextField.kt
@@ -19,6 +19,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Shape
 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
@@ -46,7 +47,9 @@ fun PasswordTextField(
   trailingIcon: @Composable (() -> Unit)? = null,
   isError: Boolean = false,
   keyboardOptions: KeyboardOptions = KeyboardOptions.Default.copy(
-    keyboardType = KeyboardType.Password
+    keyboardType = KeyboardType.Password,
+    autoCorrect = false,
+    capitalization = KeyboardCapitalization.None
   ),
   keyboardActions: KeyboardActions = KeyboardActions(),
   singleLine: Boolean = false,