diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php
index ca5586c6e8..76cd9caa15 100644
--- a/module/admin/lang/en.php
+++ b/module/admin/lang/en.php
@@ -42,7 +42,6 @@ $lang->admin->safe = new stdclass();
 $lang->admin->safe->common    = 'Safe';
 $lang->admin->safe->set       = 'Set password safe';
 $lang->admin->safe->password  = 'Password safe';
-$lang->admin->safe->md5Pwd    = 'Encrypt Password';
 $lang->admin->safe->weak      = 'weak Password';
 $lang->admin->safe->reason    = 'Type';
 $lang->admin->safe->checkWeak = 'Weak password check';
@@ -51,9 +50,6 @@ $lang->admin->safe->modeList[0] = 'Do not check';
 $lang->admin->safe->modeList[1] = 'Intermediate';
 $lang->admin->safe->modeList[2] = 'Strong';
 
-$lang->admin->safe->md5PwdList[0] = 'No encryption';
-$lang->admin->safe->md5PwdList[1] = 'Encryptiton';
-
 $lang->admin->safe->reasonList['weak']     = 'Common weak password';
 $lang->admin->safe->reasonList['account']  = 'Same account';
 $lang->admin->safe->reasonList['mobile']   = 'Same mobile';
@@ -61,5 +57,4 @@ $lang->admin->safe->reasonList['phone']    = 'Same phone';
 $lang->admin->safe->reasonList['birthday'] = 'Same birthday';
 
 $lang->admin->safe->noticeMode   = 'The system will log in, create and modify the user password, check the user password.';
-$lang->admin->safe->noticeMd5Pwd = 'When login, encrypt password before submit.';
 $lang->admin->safe->noticeStrong = 'The longer the password length, the more the number of letters or numbers or special characters, the more secure!';
diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php
index f624b328bc..2f2efe1657 100644
--- a/module/admin/lang/zh-cn.php
+++ b/module/admin/lang/zh-cn.php
@@ -42,7 +42,6 @@ $lang->admin->safe = new stdclass();
 $lang->admin->safe->common    = '安全';
 $lang->admin->safe->set       = '密码安全设置';
 $lang->admin->safe->password  = '密码安全';
-$lang->admin->safe->md5Pwd    = '密码加密';
 $lang->admin->safe->weak      = '常用弱口令';
 $lang->admin->safe->reason    = '类型';
 $lang->admin->safe->checkWeak = '弱口令扫描';
@@ -51,9 +50,6 @@ $lang->admin->safe->modeList[0] = '不检查';
 $lang->admin->safe->modeList[1] = '中';
 $lang->admin->safe->modeList[2] = '强';
 
-$lang->admin->safe->md5PwdList[0] = '不加密';
-$lang->admin->safe->md5PwdList[1] = '加密';
-
 $lang->admin->safe->reasonList['weak']     = '常用弱口令';
 $lang->admin->safe->reasonList['account']  = '与账号相同';
 $lang->admin->safe->reasonList['mobile']   = '与手机相同';
@@ -61,5 +57,4 @@ $lang->admin->safe->reasonList['phone']    = '与电话相同';
 $lang->admin->safe->reasonList['birthday'] = '与生日相同';
 
 $lang->admin->safe->noticeMode   = '系统会在登录、创建和修改用户、修改密码的时候检查用户口令。';
-$lang->admin->safe->noticeMd5Pwd = '系统会在登录的时候，对密码做加密后再提交。';
 $lang->admin->safe->noticeStrong = '密码长度越长，含有大写字母或数字或特殊符合越多，密码字母越不重复，安全度越强！';
diff --git a/module/admin/view/safe.html.php b/module/admin/view/safe.html.php
index c06eec8201..392e15885c 100644
--- a/module/admin/view/safe.html.php
+++ b/module/admin/view/safe.html.php
@@ -29,11 +29,6 @@
         <th></th>
         <td colspan='2'><span style='color:#03b8cf;font-weight:bold;'><?php echo $lang->admin->safe->noticeStrong;?></span></td>
       </tr>
-      <tr>
-        <th class='w-100px'><?php echo $lang->admin->safe->md5Pwd?></th>
-        <td><?php echo html::radio('md5Pwd', $lang->admin->safe->md5PwdList, isset($config->safe->md5Pwd) ? $config->safe->md5Pwd : 0)?></td>
-        <td><?php echo $lang->admin->safe->noticeMd5Pwd?></td>
-      </tr>
       <tr>
         <th><?php echo $lang->admin->safe->weak?></th>
         <td colspan='2'><?php echo html::textarea('weak', $config->safe->weak, "class='form-control' rows='4'")?></td>
diff --git a/module/my/control.php b/module/my/control.php
index 41e320cdc0..acd1fbef7c 100644
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -17,9 +17,9 @@ class my extends control
      * @access public
      * @return void
      */
-    public function __construct()
+    public function __construct($module = '', $method = '')
     {
-        parent::__construct();
+        parent::__construct($module, $method);
         $this->loadModel('user');
         $this->loadModel('dept');
         $this->my->setMenu();
diff --git a/module/user/view/login.html.php b/module/user/view/login.html.php
index a7ccf997b0..54897ec6f4 100644
--- a/module/user/view/login.html.php
+++ b/module/user/view/login.html.php
@@ -9,7 +9,7 @@
  * @version     $Id: login.html.php 5084 2013-07-10 01:31:38Z wyd621@gmail.com $
  */
 include '../../common/view/header.lite.html.php';
-if(!empty($config->safe->md5Pwd))js::import($jsRoot . 'md5.js');
+if(empty($config->notMd5Pwd))js::import($jsRoot . 'md5.js');
 ?>
 <div id='container'>
   <div id='login-panel'>