diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 8891e6552..551ddd616 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -395,13 +395,13 @@ class Mailer < ActionMailer::Base
     user = User.find_by_mail(recipients)
     @user = user
     @token = Token.get_token_from_user(user, 'autologin')
-    @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id,  :token => @token.value)
+    @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id)
 
     # edit
-    @issue_author_url = url_for(user_activities_url(@author,:token => @token.value))
-    @project_url = url_for(:controller  => 'projects', :action => 'show', :id => issue.project_id,  :token => @token.value)
+    @issue_author_url = url_for(user_activities_url(@author))
+    @project_url = url_for(:controller  => 'projects', :action => 'show', :id => issue.project_id)
 
-    @user_url = url_for(my_account_url(user,:token => @token.value))
+    @user_url = url_for(my_account_url(user))
 
 
     subject = "[#{issue.project.name} - #{issue.tracker.name} ##{issue_id}] (#{issue.status.name}) #{issue.subject}"
@@ -471,7 +471,7 @@ class Mailer < ActionMailer::Base
     recipients = @project.manager_recipients
     s = l(:text_applied_project, :id => "##{@user.show_name}", :project => @project.name)
     @token = Token.get_token_from_user(@user, 'autologin')
-    @applied_url =  url_for(:controller => 'projects', :action => 'settings', :id => @project.id,:tab=>'members', :token => @token.value)
+    @applied_url =  url_for(:controller => 'projects', :action => 'settings', :id => @project.id,:tab=>'members')
     mail :to => recipients,
          :subject => s
   end