diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 5f20ec912..cf39898fe 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -31,9 +31,9 @@ class AccountController < ApplicationController
     else
       authenticate_user
     end
-  #rescue AuthSourceException => e
-  #  logger.error "An error occured when authenticating #{params[:username]}: #{e.message}"
-   # render_error :message => e.message
+  rescue AuthSourceException => e
+    logger.error "An error occured when authenticating #{params[:username]}: #{e.message}"
+    render_error :message => e.message
   end
 
   # Log out current user and redirect to welcome page
@@ -277,18 +277,9 @@ class AccountController < ApplicationController
     end
     call_hook(:controller_account_success_authentication_after, {:user => user })
     #by young
-    code = //
-    #根据home_url生产正则表达式
-    class_eval("code = " + "/" + home_url.gsub(/\//,"\\\/") + "\\\/*(welcome)?\\\/*(\\\/index)?\/")
-    if code.match(params[:back_url])
-         redirect_to user_activities_path(user)
-    else
-      #redirect_back_or_default my_page_path
-      redirect_back_or_default User.current
-      #redirect_to User.current
-    end
-
-
+#    redirect_back_or_default my_page_path
+    redirect_back_or_default User.current
+#    redirect_to User.current
   end
 
   def set_autologin_cookie(user)