diff --git a/app/views/sessions/new.html.haml b/app/views/sessions/new.html.haml
index 09a45c39..76760654 100644
--- a/app/views/sessions/new.html.haml
+++ b/app/views/sessions/new.html.haml
@@ -12,12 +12,14 @@
 
 = form_tag sessions_path, class: 'form-horizontal' do
   .control-group
-    %label(for='nick' class='control-label')= t '.user'
+    %label(for='nick' class='control-label')
+      = User.human_attribute_name (FoodsoftConfig[:use_nick] ? :user : :email)
     .controls
       = text_field_tag 'nick', nil, autocapitalize: 'off', autocorrect: 'off'
 
   .control-group
-    %label(for='password' class='control-label')= t '.password'
+    %label(for='password' class='control-label')
+      = User.human_attribute_name :password
     .controls
       = password_field_tag 'password', nil, autocapitalize: 'off', autocorrect: 'off'
 
diff --git a/config/locales/de.yml b/config/locales/de.yml
index fc164a7c..badf52ae 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1333,9 +1333,7 @@ de:
       login: Anmelden
       nojs: Achtung, Cookies und Javascript müssen aktiviert sein! %{link} bitte abschalten.
       noscript: NoScript
-      password: Passwort
       title: Foodsoft anmelden
-      user: Benutzerin
   shared:
     articles:
       ordered: Bestellt
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 391f27ba..5e547a03 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1338,9 +1338,7 @@ en:
       login: Login
       nojs: Attention, cookies and javascript have to be activated! Please switch off %{link}.
       noscript: NoScript
-      password: Password
       title: Foodsoft login
-      user: User
   shared:
     articles:
       ordered: Ordered
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index d064380a..0a495014 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1340,9 +1340,7 @@ fr:
       login: Te connecter
       nojs: Attention, les cookies et le javascript doivent être activés! Merci de désactiver %{link}.
       noscript: NoScript
-      password: Mot de passe
       title: Te connecter à Foodsoft
-      user: Identifiant
   shared:
     articles:
       ordered: Commandé
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 2252563a..fba0e912 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1267,9 +1267,7 @@ nl:
       login: Aanmelden
       nojs: Opgelet, cookies en javascript moeten toegelaten worden! %{link} uitzetten, alsjeblieft.
       noscript: NoScript
-      password: Wachtwoord
       title: Foodsoft aanmelden
-      user: Gebruiker
   shared:
     articles:
       ordered: Besteld