diff --git a/yesod-auth/Yesod/Auth/Message.hs b/yesod-auth/Yesod/Auth/Message.hs
index c2d63645..5a154488 100644
--- a/yesod-auth/Yesod/Auth/Message.hs
+++ b/yesod-auth/Yesod/Auth/Message.hs
@@ -10,6 +10,8 @@ import Data.Text (Text)
 data AuthMessage =
       NoOpenID
     | LoginOpenID
+    | LoginGoogle
+    | LoginYahoo
     | Email
     | Password
     | Register
@@ -37,6 +39,8 @@ data AuthMessage =
 defaultMessage :: AuthMessage -> Text
 defaultMessage NoOpenID = "No OpenID identifier found"
 defaultMessage LoginOpenID = "Login via OpenID"
+defaultMessage LoginGoogle = "Login via Google"
+defaultMessage LoginYahoo = "Login via Yahoo"
 defaultMessage Email = "Email"
 defaultMessage Password = "Password"
 defaultMessage Register = "Register"
diff --git a/yesod-auth/Yesod/Auth/OpenId.hs b/yesod-auth/Yesod/Auth/OpenId.hs
index d27e49a6..4f650be4 100644
--- a/yesod-auth/Yesod/Auth/OpenId.hs
+++ b/yesod-auth/Yesod/Auth/OpenId.hs
@@ -39,6 +39,12 @@ authOpenId =
     padding-left: 18px;
 |]
         [QQ(whamlet)|
+<form method="get" action="@{tm forwardUrl}">
+    <input type="hidden" name="openid_identifier" value="https://www.google.com/accounts/o8/id">
+    <button .openid-google>_{Msg.LoginGoogle}
+<form method="get" action="@{tm forwardUrl}">
+    <input type="hidden" name="openid_identifier" value="http://me.yahoo.com">
+    <button .openid-yahoo>_{Msg.LoginYahoo}
 <form method="get" action="@{tm forwardUrl}">
     <label for="#{ident}">OpenID: #
     <input id="#{ident}" type="text" name="#{name}" value="http://">