diff --git a/Yesod/Helpers/Auth.hs b/Yesod/Helpers/Auth.hs
index aa9ea994..da4bb32e 100644
--- a/Yesod/Helpers/Auth.hs
+++ b/Yesod/Helpers/Auth.hs
@@ -571,7 +571,7 @@ $maybe fb f
     %p
         %a!href=$f$ Login via Facebook
 $maybe rpxnowSettings.y r
-    %h3 OpenID
+    %h3 Rpxnow
     %p
         %a!onclick="return false;"!href="https://$rpxnowApp.r$.rpxnow.com/openid/v2/signin?token_url=@tm.RpxnowR@"
             Login via Rpxnow
diff --git a/Yesod/Yesod.hs b/Yesod/Yesod.hs
index f87ab328..ffcebc88 100644
--- a/Yesod/Yesod.hs
+++ b/Yesod/Yesod.hs
@@ -112,6 +112,7 @@ class Eq (Route a) => Yesod a where
     defaultLayout :: GWidget sub a () -> GHandler sub a RepHtml
     defaultLayout w = do
         p <- widgetToPageContent w
+        mmsg <- getMessage
         hamletToRepHtml [$hamlet|
 !!!
 %html
@@ -119,6 +120,8 @@ class Eq (Route a) => Yesod a where
         %title $pageTitle.p$
         ^pageHead.p^
     %body
+        $maybe mmsg msg
+            %p.message $msg$
         ^pageBody.p^
 |]