diff --git a/yesod-auth/Yesod/Auth/Email.hs b/yesod-auth/Yesod/Auth/Email.hs
index 5101ff0e..2fe5d7e7 100644
--- a/yesod-auth/Yesod/Auth/Email.hs
+++ b/yesod-auth/Yesod/Auth/Email.hs
@@ -110,14 +110,15 @@ $newline never
 getRegisterR :: YesodAuthEmail master => GHandler Auth master RepHtml
 getRegisterR = do
     toMaster <- getRouteToMaster
+    email <- newIdent
     defaultLayout $ do
         setTitleI Msg.RegisterLong
         [whamlet|
 $newline never
 <p>_{Msg.EnterEmail}
 <form method="post" action="@{toMaster registerR}">
-    <label for="email">_{Msg.Email}
-    <input type="email" name="email" width="150">
+    <label for=#{email}>_{Msg.Email}
+    <input ##{email} type="email" name="email" width="150">
     <input type="submit" value=_{Msg.Register}>
 |]
 
@@ -200,6 +201,8 @@ getPasswordR :: YesodAuthEmail master => GHandler Auth master RepHtml
 getPasswordR = do
     toMaster <- getRouteToMaster
     maid <- maybeAuthId
+    pass1 <- newIdent
+    pass2 <- newIdent
     case maid of
         Just _ -> return ()
         Nothing -> do
@@ -213,13 +216,15 @@ $newline never
 <form method="post" action="@{toMaster setpassR}">
     <table>
         <tr>
-            <th>_{Msg.NewPass}
+            <th>
+                <label for=#{pass1}>_{Msg.NewPass}
             <td>
-                <input type="password" name="new">
+                <input ##{pass1} type="password" name="new">
         <tr>
-            <th>_{Msg.ConfirmPass}
+            <th>
+                <label for=#{pass2}>_{Msg.ConfirmPass}
             <td>
-                <input type="password" name="confirm">
+                <input ##{pass2} type="password" name="confirm">
         <tr>
             <td colspan="2">
                 <input type="submit" value="_{Msg.SetPassTitle}">
diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal
index 60db7fcb..e5cebd7e 100644
--- a/yesod-auth/yesod-auth.cabal
+++ b/yesod-auth/yesod-auth.cabal
@@ -1,5 +1,5 @@
 name:            yesod-auth
-version:         1.1.2.1
+version:         1.1.2.2
 license:         MIT
 license-file:    LICENSE
 author:          Michael Snoyman, Patrick Brisbin