diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php
index 04e3f14752..12f5a0d289 100644
--- a/module/admin/lang/en.php
+++ b/module/admin/lang/en.php
@@ -31,12 +31,12 @@ $lang->admin->info->donation       = 'Donation';
 $lang->admin->info->service        = 'Service fee';
 $lang->admin->info->account        = 'Community account';
 
-$lang->admin->notice->join         = "You can click %s or %s to join zentao community.";
+$lang->admin->notice->join         = "Your account is not associated with zentao community. You can %s a community account, and get 200 scores. If you have an account, just %s it with community, and you can get 150 scores.";
 $lang->admin->notice->ignore       = "ignore";
 
 $lang->admin->register->caption    = 'Register zentao community';
-$lang->admin->register->join       = 'register';
-$lang->admin->register->lblAccount = 'The account must be a series of letters and/or numbers, at least three';
+$lang->admin->register->join       = 'create';
+$lang->admin->register->lblAccount = 'Numbers and letters, at least three';
 $lang->admin->register->lblPasswd  = 'Numbers and letters, at least six';
 
 $lang->admin->register->notice->account    = 'The account must be a series of letters and/or numbers, at least three';
@@ -48,10 +48,10 @@ $lang->admin->register->notice->registered = 'The username has been registered';
 $lang->admin->register->notice->success    = 'Register successfully';
 $lang->admin->register->notice->failed     = 'Register failed';
 
-$lang->admin->login->caption = 'Login zentao community';
-$lang->admin->login->join    = 'login';
+$lang->admin->login->caption = 'Associated with community account';
+$lang->admin->login->join    = 'associate';
 
 $lang->admin->login->notice->account    = 'The account must be a series of letters and/or numbers, at least three';
 $lang->admin->login->notice->password   = 'The password must be a series of letters and/or numbers, at least six';
-$lang->admin->login->notice->success    = 'Login successfully';
-$lang->admin->login->notice->failed     = 'Login failed';
+$lang->admin->login->notice->success    = 'Associate successfully';
+$lang->admin->login->notice->failed     = 'Associate failed';
diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php
index da52ba2536..38699d9099 100644
--- a/module/admin/lang/zh-cn.php
+++ b/module/admin/lang/zh-cn.php
@@ -31,7 +31,7 @@ $lang->admin->info->donation       = '捐助禅道';
 $lang->admin->info->service        = '收费服务';
 $lang->admin->info->account        = '社区账号';
 
-$lang->admin->notice->join         = "您可以点击%s或%s禅道社区。";
+$lang->admin->notice->join         = "您的账号未关联到禅道社区，点击%s可以新建社区账号，系统赠送200积分。您还可以点击%s社区账号，系统赠送150积分。";
 $lang->admin->notice->ignore       = "不再提示";
 
 $lang->admin->register->caption    = '注册禅道社区';
@@ -48,10 +48,10 @@ $lang->admin->register->notice->registered = '用户名已注册';
 $lang->admin->register->notice->success    = '注册成功';
 $lang->admin->register->notice->failed     = '注册失败';
 
-$lang->admin->login->caption = '登录禅道社区';
-$lang->admin->login->join    = '登录';
+$lang->admin->login->caption = '关联社区账号';
+$lang->admin->login->join    = '关联';
 
 $lang->admin->login->notice->account    = '用户名必须是数字和字母组合，三位以上';
 $lang->admin->login->notice->password   = '密码必须是数字和字母组合，六位以上';
-$lang->admin->login->notice->success    = '登录成功';
-$lang->admin->login->notice->failed     = '登录失败';
+$lang->admin->login->notice->success    = '关联账户成功';
+$lang->admin->login->notice->failed     = '关联账户失败';
diff --git a/module/admin/lang/zh-tw.php b/module/admin/lang/zh-tw.php
index 40c940690a..291a68668e 100644
--- a/module/admin/lang/zh-tw.php
+++ b/module/admin/lang/zh-tw.php
@@ -31,7 +31,7 @@ $lang->admin->info->donation       = '捐助禪道';
 $lang->admin->info->service        = '收費服務';
 $lang->admin->info->account        = '社區賬號';
 
-$lang->admin->notice->join         = "您可以點擊%s或%s禪道社區。";
+$lang->admin->notice->join         = "您的賬號未關聯到禪道社區，點擊%s可以新建社區賬號，系統贈送200積分。您還可以點擊%s社區賬號，系統贈送150積分。";
 $lang->admin->notice->ignore       = "不再提示";
 
 $lang->admin->register->caption    = '註冊禪道社區';
@@ -48,10 +48,10 @@ $lang->admin->register->notice->registered = '用戶名已註冊';
 $lang->admin->register->notice->success    = '註冊成功';
 $lang->admin->register->notice->failed     = '註冊失敗';
 
-$lang->admin->login->caption = '登錄禪道社區';
-$lang->admin->login->join    = '登錄';
+$lang->admin->login->caption = '關聯社區賬號';
+$lang->admin->login->join    = '關聯';
 
 $lang->admin->login->notice->account    = '用戶名必須是數字和字母組合，三位以上';
 $lang->admin->login->notice->password   = '密碼必須是數字和字母組合，六位以上';
-$lang->admin->login->notice->success    = '登錄成功';
-$lang->admin->login->notice->failed     = '登錄失敗';
+$lang->admin->login->notice->success    = '關聯賬戶成功';
+$lang->admin->login->notice->failed     = '關聯賬戶失敗';
diff --git a/module/install/control.php b/module/install/control.php
index 7e2ccce802..bd9c6aff4d 100644
--- a/module/install/control.php
+++ b/module/install/control.php
@@ -126,10 +126,6 @@ class install extends control
             if(dao::isError()) die(js::error(dao::getError()));
             $this->loadModel('setting')->updateVersion($this->config->version);
             $this->setting->setSN();
-            //echo (js::alert($this->lang->install->success));
-            //unset($_SESSION['installing']);
-            //session_destroy();
-            //die(js::locate('index.php', 'parent'));
 			die(js::locate(inlink('step5'), 'parent'));
         }
 
@@ -169,7 +165,12 @@ class install extends control
 		{
 			$this->app->user->account = $this->session->account;
 			$response = $this->admin->registerByAPI();	
-			if($response == 'success') die(js::locate('index.php', 'parent'));
+			if($response == 'success')
+			{
+				unset($_SESSION['installing']);
+				session_destroy();
+				die(js::locate('index.php', 'parent'));
+			}
 		}
 		$this->view->sn = $this->admin->getSN();
 		$this->display();	
@@ -187,7 +188,12 @@ class install extends control
 		{
 			$this->app->user->account = $this->session->account;
 			$response = $this->admin->loginByAPI();	
-			if($response == 'success') die(js::locate('index.php', 'parent'));
+			if($response == 'success')
+			{
+				unset($_SESSION['installing']);
+				session_destroy();
+				die(js::locate('index.php', 'parent'));
+			}
 		}
 		$this->view->sn = $this->admin->getSN();
 		$this->display();
diff --git a/module/install/lang/zh-cn.php b/module/install/lang/zh-cn.php
index 02aa11ed56..77e41d863c 100644
--- a/module/install/lang/zh-cn.php
+++ b/module/install/lang/zh-cn.php
@@ -107,7 +107,7 @@ $lang->install->success = "安装成功";
 $lang->install->joinZentao = <<<EOT
 您已经成功安装禅道管理系统%s，<strong class='red'>请及时删除install.php</strong>。现在，您可以：
 
-<a href=%s>注册</a>或<a href=%s>登录</a>禅道社区，反馈建议并获得技术支持。
+<a href=%s>注册</a>禅道社区，反馈建议并获得技术支持，系统赠送200积分。如果您已经拥有社区账号，只需<a href=%s>关联</a>账号，系统将赠送150积分。
 
-<a href='/'>登录</a>禅道管理系统，设置用户及分组！
+直接<a href='/'>登录</a>禅道管理系统，设置用户及分组！
 EOT;
diff --git a/module/install/lang/zh-tw.php b/module/install/lang/zh-tw.php
index 6d33f61ac9..7a6b5399e3 100644
--- a/module/install/lang/zh-tw.php
+++ b/module/install/lang/zh-tw.php
@@ -107,7 +107,7 @@ $lang->install->success = "安裝成功";
 $lang->install->joinZentao = <<<EOT
 您已經成功安裝禪道管理系統%s，<strong class='red'>請及時刪除install.php</strong>。現在，您可以：
 
-<a href=%s>註冊</a>或<a href=%s>登錄</a>禪道社區，反饋建議並獲得技術支持。
+<a href=%s>註冊</a>禪道社區，反饋建議並獲得技術支持，系統贈送200積分。如果您已經擁有社區賬號，只需<a href=%s>關聯</a>賬號，系統將贈送150積分。
 
 <a href='/'>登錄</a>禪道管理系統，設置用戶及分組！
 EOT;
diff --git a/module/install/view/index.html.php b/module/install/view/index.html.php
index b7bd31f7ac..9578483063 100644
--- a/module/install/view/index.html.php
+++ b/module/install/view/index.html.php
@@ -15,9 +15,7 @@
   <tr><td><?php echo nl2br(sprintf($lang->install->desc, $config->version));?></td></tr>
   <tr>
     <td>
-    <?php if(!isset($latestRelease)):?>
-    <h3 class='a-center'><?php echo html::a($this->createLink('install', 'step1'), $lang->install->start);?></h3>
-    <?php else:?>
+    <?php if(isset($latestRelease) and (version_compare($latestRelease->version, $config->version) > 0)):?>
     <?php vprintf($lang->install->newReleased, $latestRelease);?>
     <h3 class='a-center'>
       <?php 
@@ -26,6 +24,8 @@
       echo html::a($this->createLink('install', 'step1'), $lang->install->keepInstalling);
       ?>
     </h3>
+	<?php else:?>
+      <h3 class='a-center'><?php echo html::a($this->createLink('install', 'step1'), $lang->install->start);?></h3>
     <?php endif;?>
     </td>
   </tr>
diff --git a/module/install/view/step2.html.php b/module/install/view/step2.html.php
index 407fc62121..c59ba424e1 100644
--- a/module/install/view/step2.html.php
+++ b/module/install/view/step2.html.php
@@ -44,7 +44,7 @@
     </tr>
     <tr>
       <th><?php echo $lang->install->dbPassword;?></th>
-      <td><?php echo html::input('dbPassword', '', 'class=text-3');?></td>
+      <td><?php echo html::password('dbPassword', '', 'class=text-3');?></td>
     </tr>
     <tr>
       <th><?php echo $lang->install->dbName;?></th>
diff --git a/module/install/view/step5.html.php b/module/install/view/step5.html.php
index 0b3db491be..520c061bd6 100644
--- a/module/install/view/step5.html.php
+++ b/module/install/view/step5.html.php
@@ -14,7 +14,7 @@
   <caption><?php echo $lang->install->success;?></caption>
   <tr>
 	<td>
-<?php echo nl2br(sprintf($lang->install->joinZentao, $config->version, inlink('register'), inlink('login')));?>
+	  <?php echo nl2br(sprintf($lang->install->joinZentao, $config->version, inlink('register'), inlink('login')));?>
 	</td>
   </tr>
 </table>
diff --git a/module/mail/lang/en.php b/module/mail/lang/en.php
index f6767c1b14..0bd5c4a462 100755
--- a/module/mail/lang/en.php
+++ b/module/mail/lang/en.php
@@ -7,7 +7,6 @@ $lang->mail->fromName     = 'The from name';
 $lang->mail->mta          = 'The style of send email';
 $lang->mail->debugExample = '0:close,1 and 2 :open,2 is more infomation than 1';
 
-$lang->mail->mtaList['']         = '';
 $lang->mail->mtaList['gmail']    = 'Gmail sever';
 $lang->mail->mtaList['smtp']     = 'Smtp server';
 $lang->mail->mtaList['phpmail']  = 'Mail function build in php';
diff --git a/module/mail/lang/zh-cn.php b/module/mail/lang/zh-cn.php
index d12a00dbb2..318c91cee8 100755
--- a/module/mail/lang/zh-cn.php
+++ b/module/mail/lang/zh-cn.php
@@ -7,7 +7,6 @@ $lang->mail->fromName     = '发信人名称';
 $lang->mail->mta          = '请选择发信方式';
 $lang->mail->debugExample = '0表示关闭调试信息,1和2表示打开调试信息，但2比1调试信息显示更详细';
 
-$lang->mail->mtaList['']         = '';
 $lang->mail->mtaList['gmail']    = 'Gmail服务器方式';
 $lang->mail->mtaList['smtp']     = 'SMTP服务器方式';
 $lang->mail->mtaList['phpmail']  = 'PHP内置mail函数';
diff --git a/module/mail/lang/zh-tw.php b/module/mail/lang/zh-tw.php
index e430e728b5..bd924d63e8 100644
--- a/module/mail/lang/zh-tw.php
+++ b/module/mail/lang/zh-tw.php
@@ -7,7 +7,6 @@ $lang->mail->fromName     = '發信人名稱';
 $lang->mail->mta          = '請選擇發信方式';
 $lang->mail->debugExample = '0表示關閉調試信息,1和2表示打開調試信息，但2比1調試信息顯示更詳細';
 
-$lang->mail->mtaList['']         = '';
 $lang->mail->mtaList['gmail']    = 'Gmail伺服器方式';
 $lang->mail->mtaList['smtp']     = 'SMTP伺服器方式';
 $lang->mail->mtaList['phpmail']  = 'PHP內置mail函數';
diff --git a/module/product/control.php b/module/product/control.php
index 25205f333b..1831128a11 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -31,7 +31,7 @@ class product extends control
 
         /* Get all products, if no, goto the create page. */
         $this->products = $this->product->getPairs();
-        if(empty($this->products) and strpos('create|view', $this->methodName) === false) $this->locate($this->createLink('product', 'create'));
+        if(empty($this->products) and strpos('create', $this->methodName) === false) $this->locate($this->createLink('product', 'create'));
         $this->view->products = $this->products;
     }