diff --git a/yesod-auth/Yesod/Auth/Kerberos.hs b/yesod-auth/Yesod/Auth/Kerberos.hs
index c91c6e29..f28d5406 100644
--- a/yesod-auth/Yesod/Auth/Kerberos.hs
+++ b/yesod-auth/Yesod/Auth/Kerberos.hs
@@ -28,6 +28,7 @@ module Yesod.Auth.Kerberos
 #include "qq.h"
 
 import Yesod.Auth
+import Yesod.Auth.Message
 import Web.Authenticate.Kerberos
 import Data.Text (Text)
 import qualified Data.Text as T
@@ -102,8 +103,12 @@ postLoginR config = do
         redirect $ toMaster LoginR
 
     case (mu,mp) of
-        (Nothing, _      ) -> errorMessage "Please fill in your username"
-        (_      , Nothing) -> errorMessage "Please fill in your password"
+        (Nothing, _      ) -> do
+            mr <- getMessageRender
+            errorMessage $ mr PleaseProvideUsername
+        (_      , Nothing) -> do
+            mr <- getMessageRender
+            errorMessage $ mr PleaseProvidePassword
         (Just u , Just p ) -> do
           result <- liftIO $ loginKerberos (usernameModifier config u) p
           case result of
diff --git a/yesod-auth/Yesod/Auth/Message.hs b/yesod-auth/Yesod/Auth/Message.hs
index ead9350f..ef32b8d5 100644
--- a/yesod-auth/Yesod/Auth/Message.hs
+++ b/yesod-auth/Yesod/Auth/Message.hs
@@ -39,6 +39,8 @@ data AuthMessage =
     | InvalidLogin
     | NowLoggedIn
     | LoginTitle
+    | PleaseProvideUsername
+    | PleaseProvidePassword
 
 -- | Defaults to 'englishMessage'.
 defaultMessage :: AuthMessage -> Text
@@ -75,6 +77,8 @@ englishMessage LoginViaEmail = "Login via email"
 englishMessage InvalidLogin = "Invalid login"
 englishMessage NowLoggedIn = "You are now logged in"
 englishMessage LoginTitle = "Login"
+englishMessage PleaseProvideUsername = "Please fill in your username"
+englishMessage PleaseProvidePassword = "Please fill in your password"
 
 portugueseMessage :: AuthMessage -> Text
 portugueseMessage NoOpenID = "Nenhum identificador OpenID encontrado"
@@ -107,3 +111,5 @@ portugueseMessage LoginViaEmail = "Entrar via e-mail"
 portugueseMessage InvalidLogin = "Informações de login inválidas"
 portugueseMessage NowLoggedIn = "Você acaba de entrar no site com sucesso!"
 portugueseMessage LoginTitle = "Entrar no site"
+portugueseMessage PleaseProvideUsername = englishMessage PleaseProvideUsername
+portugueseMessage PleaseProvidePassword = englishMessage PleaseProvidePassword