diff --git a/app/src/main/java/eu/steffo/twom/create/CreateActivityContent.kt b/app/src/main/java/eu/steffo/twom/create/CreateActivityContent.kt
index 662d73f..f4992cd 100644
--- a/app/src/main/java/eu/steffo/twom/create/CreateActivityContent.kt
+++ b/app/src/main/java/eu/steffo/twom/create/CreateActivityContent.kt
@@ -59,6 +59,7 @@ fun CreateActivityContent(
                     .height(60.dp)
                     .padding(start = 10.dp)
                     .fillMaxWidth(),
+                singleLine = true,
                 label = {
                     Text(stringResource(R.string.create_name_label))
                 },
diff --git a/app/src/main/java/eu/steffo/twom/login/LoginActivityContent.kt b/app/src/main/java/eu/steffo/twom/login/LoginActivityContent.kt
index 4e78d42..3b35ff9 100644
--- a/app/src/main/java/eu/steffo/twom/login/LoginActivityContent.kt
+++ b/app/src/main/java/eu/steffo/twom/login/LoginActivityContent.kt
@@ -58,6 +58,7 @@ fun LoginActivityContent(
         Row(TwoMPadding.base) {
             TextField(
                 modifier = Modifier.fillMaxWidth(),
+                singleLine = true,
                 value = username,
                 onValueChange = { username = it },
                 label = {
@@ -74,6 +75,7 @@ fun LoginActivityContent(
         Row(TwoMPadding.base) {
             PasswordField(
                 modifier = Modifier.fillMaxWidth(),
+                singleLine = true,
                 value = password,
                 onValueChange = { password = it },
                 label = {