diff --git a/tests/BasicTests.hs b/tests/BasicTests.hs
--- a/tests/BasicTests.hs
+++ b/tests/BasicTests.hs
@@ -45,7 +45,7 @@
 
             post' "/auth/page/account/resetpassword" $ do
                 byLabel "Username" "abc"
-                addNonce
+                addToken
 
             statusIs redirectCode
             get' "/"
@@ -86,4 +86,3 @@
 
             statusIs 400
             bodyContains "As a protection against cross-site"
-  
diff --git a/tests/ChangePasswordLogged.hs b/tests/ChangePasswordLogged.hs
--- a/tests/ChangePasswordLogged.hs
+++ b/tests/ChangePasswordLogged.hs
@@ -32,7 +32,7 @@
             statusIs 200
 
             post'"/auth/page/account/newaccount" $ do
-                addNonce
+                addToken
                 byLabel "Username" "aaa"
                 byLabel "Email" "tst@example.com"
                 byLabel "Password" "xxx"
@@ -57,7 +57,7 @@
 
             -- resend verify email
             post'"/auth/page/account/resendverifyemail" $ do
-                addNonce
+                addToken
                 addPostParam f1 "aaa" -- username is also a hidden field
             statusIs redirectCode
             get' "/"
@@ -94,7 +94,7 @@
             -- good key
             get' "/auth/page/account/newpasswordlgd"
             post'"/auth/page/account/setpassword" $ do
-                addNonce
+                addToken
                 byLabel "Please fill in your current password" "xxx"
                 byLabel "New password" "www"
                 byLabel "Confirm" "www"
diff --git a/tests/NewAccount.hs b/tests/NewAccount.hs
--- a/tests/NewAccount.hs
+++ b/tests/NewAccount.hs
@@ -37,7 +37,7 @@
             bodyContains "Register"
 
             post'"/auth/page/account/newaccount" $ do
-                addNonce
+                addToken
                 byLabel "Username" "abc"
                 byLabel "Email" "test@example.com"
                 byLabel "Password" "xxx"
@@ -53,7 +53,7 @@
             statusIs 200
 
             post'"/auth/page/account/newaccount" $ do
-                addNonce
+                addToken
                 byLabel "Username" "abc"
                 byLabel "Email" "test@example.com"
                 byLabel "Password" "xxx"
@@ -104,7 +104,7 @@
 
             -- resend verify email
             post'"/auth/page/account/resendverifyemail" $ do
-                addNonce
+                addToken
                 addPostParam f1 "abc" -- username is also a hidden field
             statusIs redirectCode
             get' "/"
@@ -159,7 +159,7 @@
             bodyContains "Send password reset email"
             post'"/auth/page/account/resetpassword" $ do
                 byLabel "Username" "abc"
-                addNonce
+                addToken
             statusIs redirectCode
             get' "/"
             statusIs 200
@@ -173,7 +173,7 @@
             get' newpwd
             statusIs 200
             post'"/auth/page/account/setpassword" $ do
-                addNonce
+                addToken
                 byLabel "New password" "www"
                 byLabel "Confirm" "www"
                 addPostParam f1 "abc"
@@ -186,7 +186,7 @@
             statusIs 200
             matches <- htmlQuery $ "input[name=" <> f2 <> "][type=hidden][value]"
             post'"/auth/page/account/setpassword" $ do
-                addNonce
+                addToken
                 byLabel "New password" "www"
                 byLabel "Confirm" "www"
                 addPostParam f1 "abc"
@@ -217,7 +217,7 @@
             statusIs 200
 
             post' "/auth/page/account/newaccount" $ do
-                addNonce
+                addToken
                 byLabel "Username" "x.y"
                 byLabel "Email" "xy@example.com"
                 byLabel "Password" "hunter2"
diff --git a/yesod-auth-account-fork.cabal b/yesod-auth-account-fork.cabal
--- a/yesod-auth-account-fork.cabal
+++ b/yesod-auth-account-fork.cabal
@@ -1,5 +1,5 @@
 name:              yesod-auth-account-fork
-version:           2.0.2
+version:           2.0.3
 cabal-version:     >= 1.8
 build-type:        Simple
 synopsis:          An account authentication plugin for Yesod