diff --git a/CHANGES.md b/CHANGES.md
index 3e771a79d4..aa353fe633 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -9,7 +9,7 @@ Improvements 🙌:
  -
 
 Bugfix 🐛:
- -
+ - Account creation: wrongly hints that an email can be used to create an account (#941)
 
 Translations 🗣:
  -
diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt b/vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt
index 93b1b1b525..3e45eeb406 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt
@@ -40,7 +40,7 @@ import javax.inject.Inject
 
 /**
  * In this screen, in signin mode:
- * - the user is asked for login and password to sign in to a homeserver.
+ * - the user is asked for login (or email) and password to sign in to a homeserver.
  * - He also can reset his password
  * In signup mode:
  * - the user is asked for login and password
@@ -97,6 +97,12 @@ class LoginFragment @Inject constructor() : AbstractLoginFragment() {
             SignMode.SignIn  -> R.string.login_connect_to
         }
 
+        loginFieldTil.hint = getString(when (state.signMode) {
+            SignMode.Unknown -> error("developer error")
+            SignMode.SignUp  -> R.string.login_signup_username_hint
+            SignMode.SignIn  -> R.string.login_signin_username_hint
+        })
+
         when (state.serverType) {
             ServerType.MatrixOrg -> {
                 loginServerIcon.isVisible = true
diff --git a/vector/src/main/res/layout/fragment_login.xml b/vector/src/main/res/layout/fragment_login.xml
index fb445dfb89..3f2443440e 100644
--- a/vector/src/main/res/layout/fragment_login.xml
+++ b/vector/src/main/res/layout/fragment_login.xml
@@ -50,8 +50,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
-                android:hint="@string/login_signup_username_hint"
-                app:errorEnabled="true">
+                app:errorEnabled="true"
+                tools:hint="@string/login_signin_username_hint">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/loginField"
diff --git a/vector/src/main/res/values-bg/strings.xml b/vector/src/main/res/values-bg/strings.xml
index 873fe447f1..3428cbbfde 100644
--- a/vector/src/main/res/values-bg/strings.xml
+++ b/vector/src/main/res/values-bg/strings.xml
@@ -1907,7 +1907,7 @@
     <string name="login_msisdn_error_other">Телефонния номер изглежда невалиден. Моля проверете го</string>
 
     <string name="login_signup_to">Регистрация в %1$s</string>
-    <string name="login_signup_username_hint">Потребителско име или имейл</string>
+    <string name="login_signin_username_hint">Потребителско име или имейл</string>
     <string name="login_signup_password_hint">Парола</string>
     <string name="login_signup_submit">Напред</string>
     <string name="login_signup_error_user_in_use">Това потребителско име е заето</string>
diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index fe059320d3..6c3ad4e84e 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -1941,7 +1941,7 @@ Wenn du diese neue Wiederherstellungsmethode nicht eingerichtet hast, kann ein A
     <string name="login_msisdn_confirm_notice">Wir haben einen Code an %1$s gesendet. Gib diesen unten ein um dich zu verifizieren.</string>
     <string name="login_msisdn_confirm_hint">Code eingeben</string>
     <string name="login_msisdn_confirm_send_again">Erneut senden</string>
-    <string name="login_signup_username_hint">Benutzername oder E-Mail-Adresse</string>
+    <string name="login_signin_username_hint">Benutzername oder E-Mail-Adresse</string>
     <string name="login_signup_password_hint">Passwort</string>
     <string name="login_signup_error_user_in_use">Dieser Benutzername ist bereits belegt</string>
     <string name="login_signup_cancel_confirmation_content">Dein Benutzerkonto ist noch nicht erstellt.
diff --git a/vector/src/main/res/values-eu/strings.xml b/vector/src/main/res/values-eu/strings.xml
index 91432ac66e..86fb1e0e12 100644
--- a/vector/src/main/res/values-eu/strings.xml
+++ b/vector/src/main/res/values-eu/strings.xml
@@ -1909,7 +1909,7 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
     <string name="login_msisdn_error_other">Telefono zenbakia baliogabea dirudi. Egiaztatu ezazu</string>
 
     <string name="login_signup_to">Erregistratu %1$s zerbitzarian</string>
-    <string name="login_signup_username_hint">Erabiltzaile-izena edo e-maila</string>
+    <string name="login_signin_username_hint">Erabiltzaile-izena edo e-maila</string>
     <string name="login_signup_password_hint">Pasahitza</string>
     <string name="login_signup_submit">Hurrengoa</string>
     <string name="login_signup_error_user_in_use">Erabiltzaile-izen hori hartuta dago</string>
diff --git a/vector/src/main/res/values-fi/strings.xml b/vector/src/main/res/values-fi/strings.xml
index 4966a5ea6a..fef747d546 100644
--- a/vector/src/main/res/values-fi/strings.xml
+++ b/vector/src/main/res/values-fi/strings.xml
@@ -1962,7 +1962,7 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
     <string name="login_msisdn_error_other">Puhelinnumero vaikuttaa epäkelvolta. Tarkista numero</string>
 
     <string name="login_signup_to">Rekisteröidy palvelimelle %1$s</string>
-    <string name="login_signup_username_hint">Käyttäjätunnus tai sähköpostiosoite</string>
+    <string name="login_signin_username_hint">Käyttäjätunnus tai sähköpostiosoite</string>
     <string name="login_signup_password_hint">Salasana</string>
     <string name="login_signup_submit">Seuraava</string>
     <string name="login_signup_error_user_in_use">Käyttäjätunnus on varattu</string>
diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index 86547b02fd..959266b9b7 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -1918,7 +1918,7 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
     <string name="login_msisdn_error_other">Le numéro de téléphone n’a pas l’air d’être valide. Veuillez le vérifier</string>
 
     <string name="login_signup_to">S’inscrire sur %1$s</string>
-    <string name="login_signup_username_hint">Nom d’utilisateur ou e-mail</string>
+    <string name="login_signin_username_hint">Nom d’utilisateur ou e-mail</string>
     <string name="login_signup_password_hint">Mot de passe</string>
     <string name="login_signup_submit">Suivant</string>
     <string name="login_signup_error_user_in_use">Ce nom d’utilisateur est déjà pris</string>
diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml
index 4598e445fa..64eee79075 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@@ -1913,7 +1913,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="login_msisdn_error_other">A telefonszám érvénytelennek látszik. Kérlek ellenőrizd</string>
 
     <string name="login_signup_to">Bejelentkezés ide: %1$s</string>
-    <string name="login_signup_username_hint">Felhasználónév vagy e-mail</string>
+    <string name="login_signin_username_hint">Felhasználónév vagy e-mail</string>
     <string name="login_signup_password_hint">Jelszó</string>
     <string name="login_signup_submit">Következő</string>
     <string name="login_signup_error_user_in_use">A felhasználónév már használatban van</string>
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index 6c10f7b04f..4d1ac8edaf 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -1963,7 +1963,7 @@
     <string name="login_msisdn_error_other">Il numero di telefono non sembra valido. Ricontrollalo</string>
 
     <string name="login_signup_to">Registrati su %1$s</string>
-    <string name="login_signup_username_hint">Nome utente o email</string>
+    <string name="login_signin_username_hint">Nome utente o email</string>
     <string name="login_signup_password_hint">Password</string>
     <string name="login_signup_submit">Avanti</string>
     <string name="login_signup_error_user_in_use">Quel nome utente esiste già</string>
diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml
index 397a245289..a8af77d59b 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -1871,7 +1871,7 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
     <string name="login_msisdn_error_other">Numri i telefonit duket se është i vlefshëm. Ju lutemi, kontrollojeni</string>
 
     <string name="login_signup_to">Regjistrohuni te %1$s</string>
-    <string name="login_signup_username_hint">Emër përdoruesi ose email</string>
+    <string name="login_signin_username_hint">Emër përdoruesi ose email</string>
     <string name="login_signup_password_hint">Fjalëkalim</string>
     <string name="login_signup_submit">Pasuesi</string>
     <string name="login_signup_error_user_in_use">Ai emër përdoruesi është i zënë</string>
diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index 9e36a2ec3a..d285c364b2 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -1866,7 +1866,7 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="login_msisdn_error_other">電話號碼似乎無效。請檢查</string>
 
     <string name="login_signup_to">註冊至 %1$s</string>
-    <string name="login_signup_username_hint">使用者名稱或電子郵件</string>
+    <string name="login_signin_username_hint">使用者名稱或電子郵件</string>
     <string name="login_signup_password_hint">密碼</string>
     <string name="login_signup_submit">下一個</string>
     <string name="login_signup_error_user_in_use">使用者名稱已被使用</string>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 7693bc8cee..29fff11230 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -1912,7 +1912,7 @@ Not all features in Riot are implemented in RiotX yet. Main missing (and coming
 
     <!-- Replaced string is the homeserver url -->
     <string name="login_signup_to">Sign up to %1$s</string>
-    <string name="login_signup_username_hint">Username or email</string>
+    <string name="login_signin_username_hint">Username or email</string>
     <string name="login_signup_password_hint">Password</string>
     <string name="login_signup_submit">Next</string>
     <string name="login_signup_error_user_in_use">That username is taken</string>
diff --git a/vector/src/main/res/values/strings_riotX.xml b/vector/src/main/res/values/strings_riotX.xml
index 15fd002e89..6f2af1e7ac 100644
--- a/vector/src/main/res/values/strings_riotX.xml
+++ b/vector/src/main/res/values/strings_riotX.xml
@@ -23,9 +23,7 @@
 
     <!-- BEGIN Strings added by Benoit -->
     <string name="message_action_item_redact">Remove…</string>
-    <!-- END Strings added by Benoit -->
-
-
+    <string name="login_signup_username_hint">Username</string>
     <!-- BEGIN Strings added by Benoit -->
 
     <!-- END Strings added by Benoit -->