diff --git a/resources/assets/src/sass/auth.scss b/resources/assets/src/sass/auth.scss
index 0fdb0fa2..8ccd4314 100644
--- a/resources/assets/src/sass/auth.scss
+++ b/resources/assets/src/sass/auth.scss
@@ -8,3 +8,7 @@
 .login-logo a:hover, .register-logo a:hover, .reset-logo a:hover {
     color: #42a5f5;
 }
+
+#login-button {
+    margin-top: 5px;
+}
diff --git a/resources/lang/en/auth.yml b/resources/lang/en/auth.yml
index 8e3b3ab2..b66259eb 100644
--- a/resources/lang/en/auth.yml
+++ b/resources/lang/en/auth.yml
@@ -73,5 +73,5 @@ password: Password
 captcha: Please enter the CAPTCHA.
 change-captcha: Click to change CAPTCHA image.
 login-link: Already registered? Log in here.
-forgot-link: Forgot your password?
-register-link: Register new account
+forgot-link: Forgot password?
+register-link: Register a new account
diff --git a/resources/lang/zh_CN/auth.yml b/resources/lang/zh_CN/auth.yml
index bc3d66b2..e5e95801 100644
--- a/resources/lang/zh_CN/auth.yml
+++ b/resources/lang/zh_CN/auth.yml
@@ -74,5 +74,5 @@ password: 密码
 captcha: 请输入验证码
 change-captcha: 点击以更换图片
 login-link: 已经有账号了？登录
-forgot-link: 忘记密码
+forgot-link: 忘记密码？
 register-link: 注册新账号
diff --git a/resources/views/auth/login.tpl b/resources/views/auth/login.tpl
index 4b29411a..d549e881 100644
--- a/resources/views/auth/login.tpl
+++ b/resources/views/auth/login.tpl
@@ -42,24 +42,26 @@
             <div id="msg" class="callout hide"></div>
 
             <div class="row">
-                <div class="col-xs-8">
-                    <div class="checkbox icheck">
+                <div class="col-xs-6">
+                    <div class="checkbox icheck" style="margin-top: 0;">
                         <label for="keep">
                             <input id="keep" type="checkbox"> {{ trans('auth.login.keep') }}
                         </label>
                     </div>
-                </div>
-                <!-- /.col -->
-                <div class="col-xs-4">
+                </div><!-- /.col -->
+                <div class="col-xs-6">
+                    <a class="pull-right" href="{{ url('auth/forgot') }}">{{ trans('auth.forgot-link') }}</a>
+                </div><!-- /.col -->
+            </div>
+
+            <div class="row">
+                <div class="col-xs-12">
                     <button id="login-button" class="btn btn-primary btn-block btn-flat">{{ trans('auth.login.button') }}</button>
-                </div>
-                <!-- /.col -->
+                </div><!-- /.col -->
             </div>
         </form>
-
-        <a href="{{ url('auth/forgot') }}">{{ trans('auth.forgot-link') }}</a><br>
-        <a href="{{ url('auth/register') }}" class="text-center">{{ trans('auth.register-link') }}</a>
-
+        <br>
+        <a href="{{ url('auth/register') }}" class="pull-left" style="margin-top: -10px;">{{ trans('auth.register-link') }}</a>
     </div>
     <!-- /.login-box-body -->
 </div>