diff --git a/module/user/control.php b/module/user/control.php
index d3983c7b7c..bac616f1fe 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -539,17 +539,16 @@ class user extends control
         }
         else
         { 
-            $demoUsers = $this->user->getPairs('nodeleted, noletter');
-            array_shift($demoUsers);
-            array_shift($demoUsers);
-            array_pop($demoUsers);
-            $this->view->showDemoUsers = $this->dao->select('value')->from(TABLE_CONFIG)->where('`key`')->eq('showDemoUsers')->fetch();
-            $this->view->demoUsers = $demoUsers;
+            if(!empty($this->config->global->showDemoUsers))
+            {
+                $demoUsers = $this->user->getPairs('nodeleted, noletter, noempty, noclosed');
+                $this->view->demoUsers = $demoUsers;
+            }
 
             $header['title'] = $this->lang->user->login;
             $this->view->header    = $header;
             $this->view->referer   = $this->referer;
-            $this->view->s         = $this->loadModel('setting')->getItem('system', 'common', 'global', 'sn', 0);
+            $this->view->s         = $this->config->global->sn;
             $this->view->keepLogin = $this->cookie->keepLogin ? $this->cookie->keepLogin : 'off';
             $this->display();
         }
diff --git a/module/user/view/login.html.php b/module/user/view/login.html.php
index ef59cea3c8..01fe052528 100644
--- a/module/user/view/login.html.php
+++ b/module/user/view/login.html.php
@@ -37,24 +37,27 @@ include '../../common/view/colorbox.html.php';
       </td>
     </tr>  
   </table>
-  <?php if($showDemoUsers):?>  
+
+  <?php if(isset($demoUsers)):?>  
   <div id='demoUsers'>  
-  <?php
-      echo "<span>" . $lang->user->loginWithDemoUser . "</span>";
-      $sign = $config->requestType == 'GET' ? '&' : '?';
-      if(isset($demoUsers['productManager'])) echo html::a(inlink('login') . $sign . "account=productManager&password=123456", $demoUsers['productManager'], 'hiddenwin');
-      if(isset($demoUsers['projectManager'])) echo html::a(inlink('login') . $sign . "account=projectManager&password=123456", $demoUsers['projectManager'], 'hiddenwin');
-      if(isset($demoUsers['testManager']))    echo html::a(inlink('login') . $sign . "account=testManager&password=123456",    $demoUsers['testManager'],    'hiddenwin');
-      if(isset($demoUsers['dev1']))           echo html::a(inlink('login') . $sign . "account=dev1&password=123456",           $demoUsers['dev1'],           'hiddenwin');
-      if(isset($demoUsers['tester1']))        echo html::a(inlink('login') . $sign . "account=tester1&password=123456",        $demoUsers['tester1'],        'hiddenwin');
-  ?>  
+    <?php
+    echo "<span>" . $lang->user->loginWithDemoUser . "</span>";
+    $sign = $config->requestType == 'GET' ? '&' : '?';
+    if(isset($demoUsers['productManager'])) echo html::a(inlink('login') . $sign . "account=productManager&password=123456", $demoUsers['productManager'], 'hiddenwin');
+    if(isset($demoUsers['projectManager'])) echo html::a(inlink('login') . $sign . "account=projectManager&password=123456", $demoUsers['projectManager'], 'hiddenwin');
+    if(isset($demoUsers['testManager']))    echo html::a(inlink('login') . $sign . "account=testManager&password=123456",    $demoUsers['testManager'],    'hiddenwin');
+    if(isset($demoUsers['dev1']))           echo html::a(inlink('login') . $sign . "account=dev1&password=123456",           $demoUsers['dev1'],           'hiddenwin');
+    if(isset($demoUsers['tester1']))        echo html::a(inlink('login') . $sign . "account=tester1&password=123456",        $demoUsers['tester1'],        'hiddenwin');
+    ?>  
   </div>  
   <?php endif;?>  
+
   <div id='poweredby'>
     powered by <a href='http://www.zentao.net' target='_blank'>ZenTaoPMS</a>(<?php echo $config->version;?>)
     <?php echo $lang->donate;?>
     <br />
     <iframe id='updater' class='hidden' frameborder='0' scrolling='no' allowtransparency='true' src="http://www.zentao.net/updater-isLatest-<?php echo $config->version;?>-<?php echo $s;?>.html"></iframe>
   </div>
+
 </form>
 <?php include '../../common/view/footer.lite.html.php';?>