diff --git a/upload/source/class/class_member.php b/upload/source/class/class_member.php
index 1a511837bd95ea1443a8654e160e73b7bd952cdd..95da5fa9a343df17b5b5289de1485bb6b4d03284 100644
--- a/upload/source/class/class_member.php
+++ b/upload/source/class/class_member.php
@@ -247,7 +247,7 @@ class logging_ctl {
 
 				if(!$freeze || !$this->setting['accountguard']['loginpwcheck']) {
 					$loginmessage = $_G['groupid'] == 8 ? 'login_succeed_inactive_member' : 'login_succeed';
-					$location = $invite || $_G['groupid'] == 8 ? 'home.php?mod=space&do=home' : dreferer();
+					$location = $invite || $_G['groupid'] == 8 ? 'home.php?mod=spacecp&ac=profile&op=password' : dreferer();
 				} else {
 					$loginmessage = 'login_succeed_password_change';
 					$location = 'home.php?mod=spacecp&ac=profile&op=password';
diff --git a/upload/source/language/lang_message.php b/upload/source/language/lang_message.php
index 6ea31131c3dfbf8c11e4e90db140ac7712253da2..2813071cd45709e9ac991b6b9bc14418f6ce25fa 100644
--- a/upload/source/language/lang_message.php
+++ b/upload/source/language/lang_message.php
@@ -1021,7 +1021,7 @@ $lang = array (
   'location_login_succeed_mobile' => '欢迎您回来，{username}。点击进入登录前页面',
   'location_login_succeed' => '',
   'location_activation' => '您的帐号处于未激活状态，点击进行激活',
-  'login_succeed_inactive_member' => '欢迎您回来，{usergroup} {username}。您的帐号处于非激活状态，现在将转入控制面板',
+  'login_succeed_inactive_member' => '欢迎您回来，{usergroup} {username}。您的帐号处于非激活状态，部分功能可能无法正常使用，现在将转入密码安全页面',
   'login_succeed_password_change' => '您的账户存在安全隐患，建议立即修改密码',
   'login_question_empty' => '请选择安全提问以及填写正确的答案',
   'login_question_invalid' => '抱歉，安全提问答案填写错误',