diff --git a/media/css/seahub.css b/media/css/seahub.css
index 5b05638fd6..b2cff04be6 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -2355,13 +2355,11 @@ button.sf-dropdown-toggle:focus {
 }
 .login-panel .submit {
     margin:20px 0 15px;
-    border-width:0;
-    border-radius:4px;
-    width:100%;
+    background-image: none;
     height:42px;
-    background:#f19645;
-    color:#f8f9fa;
-    font-size:14px;
+}
+.login-panel .submit:focus {
+    border-color: #f19645;
 }
 .login-panel-bottom-container {
     margin-top:10px;
diff --git a/seahub/templates/base.html b/seahub/templates/base.html
index 3eed29a9c1..c160366e76 100644
--- a/seahub/templates/base.html
+++ b/seahub/templates/base.html
@@ -11,7 +11,9 @@
 {% endblock %}
 <meta http-equiv="x-ua-compatible" content="ie=edge" />
 <link rel="shortcut icon" href="{{ MEDIA_URL }}{{ favicon_path }}" />
+{% block extra_base_style %}
 <link rel="stylesheet" type="text/css" href="{% static "css/bootstrap.min.css" %}"/>
+{% endblock %}
 <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/jstree_default_theme/style.min.css" />
 <link rel="stylesheet" type="text/css" href="{% static "css/magnific-popup.css" %}" />
 <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/seahub.css?t=1398068110" />
diff --git a/seahub/templates/choose_register.html b/seahub/templates/choose_register.html
index bf1ff01afc..c86d57a143 100644
--- a/seahub/templates/choose_register.html
+++ b/seahub/templates/choose_register.html
@@ -6,8 +6,8 @@
 <div class="login-panel-outer-container vh">
     <div class="login-panel">
         <h1 class="login-panel-hd">{% trans "Signup" %}</h1>
-        <button id="personal" class="submit">{% trans "Create a personal account" %}</button>
-        <button id="org" class="submit">{% trans "Create an organization account" %}</button>
+        <button id="personal" class="submit btn btn-primary btn-block">{% trans "Create a personal account" %}</button>
+        <button id="org" class="submit btn btn-primary btn-block">{% trans "Create an organization account" %}</button>
     </div>
 </div>
 {% endblock %}
diff --git a/seahub/templates/registration/login.html b/seahub/templates/registration/login.html
index dee5f28fbe..3b82c59e42 100644
--- a/seahub/templates/registration/login.html
+++ b/seahub/templates/registration/login.html
@@ -2,7 +2,13 @@
 {% load i18n %}
 
 {% block sub_title %}{% trans "Log In" %} - {% endblock %}
+
 {% block header_css_class %}hide{% endblock %}
+
+{% block extra_base_style %}
+<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/seafile-ui.css" />
+{% endblock %}
+
 {% block extra_style %}
 <style type="text/css">
 html, body, #wrapper { height:100%; }
@@ -61,7 +67,7 @@ html, body, #wrapper { height:100%; }
         </label>
         <a href="{{ SITE_ROOT }}accounts/password/reset/" class="normal forgot-passwd">{% trans "Forgot password?" %}</a>
 
-        <button type="submit" class="submit">{% trans "Log In" %}</button>
+        <button type="submit" class="submit btn btn-primary btn-block">{% trans "Log In" %}</button>
     </form>
 
     {% if enable_sso %}
diff --git a/seahub/templates/registration/registration_form.html b/seahub/templates/registration/registration_form.html
index c6d5d6b3aa..bf33621b6f 100644
--- a/seahub/templates/registration/registration_form.html
+++ b/seahub/templates/registration/registration_form.html
@@ -43,7 +43,7 @@
             {% endif %}
 
             <p class="error hide"></p>
-            <button type="submit" class="submit">{% trans "Sign Up" %}</button>
+            <button type="submit" class="submit btn btn-primary btn-block">{% trans "Sign Up" %}</button>
         </form>
         <div class="login-panel-bottom-container">
             {# language will be shown here #}