diff --git a/customize.dist/pages/login.js b/customize.dist/pages/login.js
index 8efdb1f56..5322c663f 100644
--- a/customize.dist/pages/login.js
+++ b/customize.dist/pages/login.js
@@ -8,8 +8,9 @@ define([
         return [h('div#cp-main', [
             Pages.infopageTopbar(),
             h('div.container.cp-container', [
-                h('div.row.align-items-center', [
-                    h('div#data.hidden.col-md-6', Pages.setHTML(h('p.left'), Msg.main_info)),
+                h('div.row.cp-page-title', h('h1', Msg.login_login)),
+                h('div.row', [
+                    h('div.col-md-3'),
                     h('div#userForm.form-group.hidden.col-md-6', [
                         h('input.form-control#name', {
                             name: 'name',
@@ -30,10 +31,11 @@ define([
                             UI.createCheckbox('import-recent', Msg.register_importRecent),
                         ]),
                         h('div.extra', [
-                            h('button.login.first.btn', Msg.login_login),
-                            h('button#register.first.btn', Msg.login_register)
+                            h('button.login', Msg.login_login),
+                            h('button#register.cp-secondary', Msg.login_register)
                         ])
-                    ])
+                    ]),
+                    h('div.col-md-3')
                 ]),
             ]),
             Pages.infopageFooter(),
diff --git a/customize.dist/src/less2/include/infopages.less b/customize.dist/src/less2/include/infopages.less
index 96df7aced..712c882ce 100644
--- a/customize.dist/src/less2/include/infopages.less
+++ b/customize.dist/src/less2/include/infopages.less
@@ -88,6 +88,11 @@ body {
                 background-color: lighten(@colortheme_logo-2, 3%);
             }
         }
+        button.cp-secondary {
+            background-color: white;
+            color: @colortheme_logo-2;
+            border: 1px solid @colortheme_logo-2;
+        }
 
         .form-group {
             & > * {
diff --git a/customize.dist/src/less2/pages/page-login.less b/customize.dist/src/less2/pages/page-login.less
index e4b3e96e0..1cc2fcffc 100644
--- a/customize.dist/src/less2/pages/page-login.less
+++ b/customize.dist/src/less2/pages/page-login.less
@@ -17,29 +17,16 @@
         }
     }
     .cp-container {
-        #data {
-            background: #4591C4;
-            padding-top: 3em;
-            padding-bottom: 7em;
-            padding-left: 30px;
-            padding-right: 30px;
-            p {
-                color: #fff;
-            }
-            h2 {
-                font-weight: 700;
-                color: @cryptpad_header_col;
-            }
-        }
         #userForm {
-            padding-top: 3em;
-            padding-bottom: 2em;
+            .cp-shadow();
+            background-color: white;
+            padding: 10px;
             .form-control {
                 border-radius: 0;
                 color: @cryptpad_text_col;
-                margin-top: 1em;
+                margin-bottom: 5px;
                 &:focus {
-                    border-color: @cryptpad_color_blue;
+                    border-color: @colortheme_logo-2;
                 }
             }
             .checkbox-container {
@@ -52,24 +39,13 @@
         }
         .extra {
             margin-top: 1em;
-            .login {
-                background: @cryptpad_color_blue;
-                color: #fff;
-                padding: 10px;
-                border-radius: 0;
-                &:hover {
-                    transform: scale(1.05);
-                }
-            }
+
             #register {
-                border-color: @cryptpad_color_blue;
+                border-color: @colortheme_logo-2;
                 background: #fff;
-                color: @cryptpad_color_blue;
+                color: @colortheme_logo-2;
                 padding: 10px;
                 border-radius: 0;
-                &:hover {
-                    transform: scale(1.05);
-                }
             }
         }
     }