diff --git a/src/Foundation.hs b/src/Foundation.hs
index 0030296a2..726a21146 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -107,7 +107,7 @@ instance Yesod UniWorX where
 
     defaultLayout widget = do
         master <- getYesod
-        mmsg <- getMessage
+        mmsgs <- getMessages
 
         muser <- maybeAuthPair
         mcurrentRoute <- getCurrentRoute
diff --git a/templates/default-layout.hamlet b/templates/default-layout.hamlet
index e61e01a6c..0210af77e 100644
--- a/templates/default-layout.hamlet
+++ b/templates/default-layout.hamlet
@@ -31,8 +31,9 @@
 
             <li .active>#{title}
 
-    $maybe msg <- mmsg
-      <div .alert.alert-info #message>#{msg}
+    $forall (status, msg) <- mmsgs
+      $with status' <- bool (const "info") id (status == "") status
+        <div class="alert alert-#{status'}">#{msg}
 
 
 $if (Just HomeR == mcurrentRoute)