diff --git a/.maestro/tests/account/login.yaml b/.maestro/tests/account/login.yaml
index e3b07bc8ae..1baf07be5b 100644
--- a/.maestro/tests/account/login.yaml
+++ b/.maestro/tests/account/login.yaml
@@ -5,7 +5,7 @@ appId: ${APP_ID}
 - takeScreenshot: build/maestro/100-SignIn
 - runFlow: changeServer.yaml
 - runFlow: ../assertions/assertLoginDisplayed.yaml
-- tapOn: "Email or username"
+- tapOn: "Username or email"
 # ios
 # - tapOn:
 #     id: "usernameTextField"
diff --git a/features/login/src/main/java/io/element/android/x/features/login/root/LoginRootScreen.kt b/features/login/src/main/java/io/element/android/x/features/login/root/LoginRootScreen.kt
index d71cb909c3..247f25fddf 100644
--- a/features/login/src/main/java/io/element/android/x/features/login/root/LoginRootScreen.kt
+++ b/features/login/src/main/java/io/element/android/x/features/login/root/LoginRootScreen.kt
@@ -138,7 +138,7 @@ fun LoginRootScreen(
                             .fillMaxWidth()
                             .padding(top = 60.dp),
                         label = {
-                            Text(text = "Email or username")
+                            Text(text = stringResource(id = ElementR.string.login_signin_username_hint))
                         },
                         onValueChange = {
                             loginFieldState = it