diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index efe5a52ee..6510d65aa 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -413,10 +413,11 @@ class ProjectsController < ApplicationController
     # 2、加入项目、创建角色
     # 3、用户得分
     if params[:mail]
-      user = User.find(params[:user_id])
+      userid = Token.find_by_value(params[:token]).user_id
+      user = User.find(userid)
       user.activate!
-      Member.create(:role_ids => [4], :user_id => params[:user_id],:project_id => params[:id])
-      UserGrade.create(:user_id => params[:user_id], :project_id => params[:id])
+      Member.create(:role_ids => [4], :user_id => userid, :project_id => params[:id])
+      UserGrade.create(:user_id => userid, :project_id => params[:id])
       token = Token.get_token_from_user(user, 'autologin')
       #user = User.try_to_autologin(token.value)
       if user
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index e19f58e47..8b8ed7d73 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -61,8 +61,8 @@ class Mailer < ActionMailer::Base
     InviteList.create(:user_id => user.id, :project_id => project.id)
     User.current = user unless User.current.nil?
     @user = user
-
-    @project_url = url_for(:controller => 'projects', :action => 'member', :id => project.id, :user_id => user.id, :mail => true)
+    @token = Token.get_token_from_user(user, 'autologin')
+    @project_url = url_for(:controller => 'projects', :action => 'member', :id => project.id, :mail => true, :token => @token.value)
     mail :to => email, :subject => @subject
   end