diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 49ecbdb7..68dfc2d1 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -21,7 +21,7 @@ class SessionsController < ApplicationController
       end
       redirect_to redirect_to_url, :notice => I18n.t('sessions.logged_in')
     else
-      flash.now.alert = I18n.t('sessions.login_invalid')
+      flash.now.alert = I18n.t(FoodsoftConfig[:use_nick] ? 'sessions.login_invalid_nick' : 'sessions.login_invalid_email')
       render "new"
     end
   end
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 22f8e56f..fcde94c8 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1359,7 +1359,8 @@ de:
   sessions:
     logged_in: Angemeldet!
     logged_out: Abgemeldet!
-    login_invalid: Ungültiger Benutzername oder Passwort
+    login_invalid_nick: Ungültiger Benutzername oder Passwort
+    login_invalid_email: Ungültiger Email oder Passwort
     new:
       forgot_password: Passwort vergessen?
       login: Anmelden
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 92c8a5f3..ccee4b52 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1372,7 +1372,8 @@ en:
   sessions:
     logged_in: Logged in!
     logged_out: Logged out!
-    login_invalid: Invalid username or password
+    login_invalid_nick: Invalid username or password
+    login_invalid_email: Invalid email address or password
     new:
       forgot_password: Forgot password?
       login: Login
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index d1ba0ac3..3b110579 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1374,7 +1374,7 @@ fr:
   sessions:
     logged_in: Connecté!
     logged_out: Déconnecté!
-    login_invalid: Identifiant ou mot de passe invalide
+    login_invalid_nick: Identifiant ou mot de passe invalide
     new:
       forgot_password: Mot de passe oublié?
       login: Te connecter
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 8067c12f..8a59cdbe 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1365,7 +1365,8 @@ nl:
   sessions:
     logged_in: Ingelogd!
     logged_out: Uitgelogd!
-    login_invalid: Onjuiste gebruikersnaam of wachtwoord
+    login_invalid_nick: Gebruikersnaam of wachtwoord onjuist
+    login_invalid_email: Emailadres of wachtwoord onjuist
     new:
       forgot_password: Wachtwoord vergeten?
       login: Aanmelden