diff --git a/skins/base/css/common.css b/skins/base/css/common.css
index 32f915e902..d90ce11ac4 100644
--- a/skins/base/css/common.css
+++ b/skins/base/css/common.css
@@ -83,6 +83,7 @@ html {
     font-size: 16px;
     position: relative;
     border-radius: 8px;
+    max-width: 75%;
 }
 
 .mx_ImageView {
diff --git a/skins/base/css/templates/Login.css b/skins/base/css/templates/Login.css
index 49feffbec5..7362ac507f 100644
--- a/skins/base/css/templates/Login.css
+++ b/skins/base/css/templates/Login.css
@@ -17,15 +17,6 @@ limitations under the License.
 .mx_Login {
     width: 100%;
     height: 100%;
-    display: -webkit-box;
-    display: -moz-box;
-    display: -ms-flexbox;
-    display: -webkit-flex;
-    display: flex;
-    -webkit-align-items: center;
-    align-items: center;
-    -webkit-justify-content: center;
-    justify-content: center;
 }
 
 .mx_Login h2 {
@@ -37,6 +28,8 @@ limitations under the License.
 
 .mx_Login_box {
     width: 300px;
+    margin: auto;
+    padding-top: 100px;
 }
 
 .mx_Login_logo {
diff --git a/skins/base/views/templates/Login.js b/skins/base/views/templates/Login.js
index bef13b1d74..57b5fbcd6d 100644
--- a/skins/base/views/templates/Login.js
+++ b/skins/base/views/templates/Login.js
@@ -110,7 +110,7 @@ module.exports = React.createClass({
         var self = this;
         this.updateHsTimeout = setTimeout(function() {
             self.onHSChosen();
-        }, 500);
+        }, 1000);
     },
 
     componentForStep: function(step) {