diff --git a/admin/login.php b/admin/login.php
index 6ceb43b5..f34ecf4f 100644
--- a/admin/login.php
+++ b/admin/login.php
@@ -17,7 +17,7 @@ include 'header.php';
         <form action="<?php $options->loginAction(); ?>" method="post" name="login" role="form">
             <p>
                 <label for="name" class="sr-only"><?php _e('用户名'); ?></label>
-                <input type="text" id="name" name="name" value="<?php echo $rememberName; ?>" placeholder="<?php _e('用户名'); ?>" class="text-l w-100" />
+                <input type="text" id="name" name="name" value="<?php echo $rememberName; ?>" placeholder="<?php _e('用户名'); ?>" class="text-l w-100" autofocus />
             </p>
             <p>
                 <label for="password" class="sr-only"><?php _e('密码'); ?></label>
@@ -28,7 +28,7 @@ include 'header.php';
                 <input type="hidden" name="referer" value="<?php echo htmlspecialchars($request->get('referer')); ?>" />
             </p>
             <p>
-                <label for="remember"><input type="checkbox" name="remember" class="checkbox" value="1" id="remember" /> <?php _e('记住我'); ?></label>
+                <label for="remember"><input type="checkbox" name="remember" class="checkbox" value="1" id="remember" /> <?php _e('下次自动登录'); ?></label>
             </p>
         </form>
         
diff --git a/admin/register.php b/admin/register.php
index e5cd4e86..84b5f932 100644
--- a/admin/register.php
+++ b/admin/register.php
@@ -19,7 +19,7 @@ include 'header.php';
         <form action="<?php $options->registerAction(); ?>" method="post" name="register" role="form">
             <p>
                 <label for="name" class="sr-only"><?php _e('用户名'); ?></label>
-                <input type="text" id="name" name="name" placeholder="<?php _e('用户名'); ?>" value="<?php echo $rememberName; ?>" class="text-l w-100" />
+                <input type="text" id="name" name="name" placeholder="<?php _e('用户名'); ?>" value="<?php echo $rememberName; ?>" class="text-l w-100" autofocus />
             </p>
             <p>
                 <label for="mail" class="sr-only"><?php _e('Email'); ?></label>
diff --git a/var/Json.php b/var/Json.php
index 6adf0f8b..7a602a4c 100644
--- a/var/Json.php
+++ b/var/Json.php
@@ -528,7 +528,7 @@ class Json
     {
         if (function_exists('json_decode')) {
             /** from php 5.1 */
-            $result = json_decode($var);
+            return json_decode($var, $assoc);
         } else {
             $result = self::_decode($var);
         }