diff --git a/app/views/users/mailer/confirmation_instructions.html.erb b/app/views/users/mailer/confirmation_instructions.html.erb
index 6a58dc4..4d1790b 100644
--- a/app/views/users/mailer/confirmation_instructions.html.erb
+++ b/app/views/users/mailer/confirmation_instructions.html.erb
@@ -4,10 +4,10 @@
 
 <p>
   <%= link_to 'Confirm my account', 
-    confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %>
+    confirmation_url(@resource, :confirmation_token => @token) %>
 </p>
 
 <p>
   If you cannot see the link copy and paste the following address in your browser address bar:<br />
-  <%= confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %>
+  <%= confirmation_url(@resource, :confirmation_token => @token) %>
 </p>
diff --git a/app/views/users/mailer/reset_password_instructions.html.erb b/app/views/users/mailer/reset_password_instructions.html.erb
index e068ec5..2282dd4 100644
--- a/app/views/users/mailer/reset_password_instructions.html.erb
+++ b/app/views/users/mailer/reset_password_instructions.html.erb
@@ -4,12 +4,12 @@
 
 <p>
   <%= link_to 'Change my password', 
-    edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %>
+    edit_password_url(@resource, :reset_password_token => @token) %>
 </p>
 
 <p>
   If you cannot see the link copy and paste the following address in your browser address bar:<br />
-  <%= edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %>
+  <%= edit_password_url(@resource, :reset_password_token => @token) %>
 </p>
 
 
diff --git a/app/views/users/mailer/unlock_instructions.html.erb b/app/views/users/mailer/unlock_instructions.html.erb
index 29da252..55ecc66 100644
--- a/app/views/users/mailer/unlock_instructions.html.erb
+++ b/app/views/users/mailer/unlock_instructions.html.erb
@@ -4,9 +4,9 @@
 
 <p>Click the link below to unlock your account:</p>
 
-<p><%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @resource.unlock_token) %></p>
+<p><%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @token) %></p>
 
 <p>
   If you cannot see the link copy and paste the following address in your browser address bar:<br />
-  <%= unlock_url(@resource, :unlock_token => @resource.unlock_token) %>
+  <%= unlock_url(@resource, :unlock_token => @token) %>
 </p>