diff --git a/api/config/settings/common.py b/api/config/settings/common.py
index 927e754d020821d87b6349e37bc38c113f547f6c..491babdd15f8d4c017230f097af4b274c880a000 100644
--- a/api/config/settings/common.py
+++ b/api/config/settings/common.py
@@ -264,7 +264,7 @@ AUTHENTICATION_BACKENDS = (
 )
 
 # Some really nice defaults
-ACCOUNT_AUTHENTICATION_METHOD = 'username'
+ACCOUNT_AUTHENTICATION_METHOD = 'username_email'
 ACCOUNT_EMAIL_REQUIRED = True
 ACCOUNT_EMAIL_VERIFICATION = 'mandatory'
 
diff --git a/front/src/components/auth/Login.vue b/front/src/components/auth/Login.vue
index 99b439af8b3e25c821ddb1dbc0c86c6419961d2c..b02a3ed07acb86d65e21686f9de1f1c9af2fc4f6 100644
--- a/front/src/components/auth/Login.vue
+++ b/front/src/components/auth/Login.vue
@@ -12,13 +12,13 @@
             </ul>
           </div>
           <div class="field">
-            <label>Username</label>
+            <label>Username or email</label>
             <input
             ref="username"
             required
             type="text"
             autofocus
-            placeholder="Enter your username"
+            placeholder="Enter your username or email"
             v-model="credentials.username"
             >
           </div>