diff --git a/core/css/guest.css b/core/css/guest.css
index 4881dca158806ab57220f658f6d5f08b71c2c0f8..1f12fd69b0a04e15392f5e5322815dba663df1cb 100644
--- a/core/css/guest.css
+++ b/core/css/guest.css
@@ -97,20 +97,19 @@ body {
 }
 
 .wrapper {
-	width: 300px;
+	max-width: 100%;
 	margin-top: 10vh;
 }
 
 /* Default FORM */
 form {
 	position: relative;
-	width: 280px;
 	margin: auto;
 	padding: 0;
 }
 form fieldset {
-	margin-bottom: 20px;
-	text-align: left;
+	width: 260px;
+	margin: auto auto 20px;
 	-webkit-user-select: none;
 	-moz-user-select: none;
 	-ms-user-select: none;
@@ -156,25 +155,34 @@ form #datadirField legend {
 #alternative-logins {
 	margin: 30px 15px 20px;
 	display: block;
+	min-width: 260px;
+	max-width: 400px;
+	overflow: hidden;
 }
 
 #alternative-logins a {
 	margin: 10px 5px;
 	display: block;
 	font-size: 15px;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
 }
 
 #alternative-logins a::before {
 	content: "";
 	background-repeat: no-repeat;
 	background-size: contain;
-	width: 18px;
+	width: 0;
 	height: 18px;
 	display: inline-block;
 	vertical-align: bottom;
-	margin-right: 5px;
 }
 
+#alternative-logins .button {
+	color: #0082c9;
+	padding: 12px 20px;
+}
 
 @media only screen and (max-width: 1024px) {
 	.wrapper {
@@ -183,6 +191,9 @@ form #datadirField legend {
 	#alternative-logins {
 		margin: 30px 15px 10px;
 	}
+	#alternative-logins .label-prefix {
+		display: none;
+	}
 }
 
 
@@ -198,6 +209,10 @@ form #datadirField legend {
 							 applied to the button instead. */
 }
 
+#submit-wrapper {
+	margin: 0 auto;
+}
+
 #submit-wrapper input.login:hover ~ .submit-icon.icon-confirm-white,
 #submit-wrapper input.login:focus ~ .submit-icon.icon-confirm-white,
 #submit-wrapper input.login:active ~ .submit-icon.icon-confirm-white {
diff --git a/core/templates/login.php b/core/templates/login.php
index c5ef765106a7ced0a0fb01edcbf75fc0650aea85..9635de2a61d0ce0540dc28db84fdbb9f4782ba30 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -8,8 +8,8 @@ script('core', 'dist/login');
 <?php if (!empty($_['alt_login'])) { ?>
     <div id="alternative-logins">
         <?php foreach($_['alt_login'] as $login): ?>
-            <a class="button primary <?php p(isset($login['style']) ? $login['style'] : ''); ?>" href="<?php print_unescaped($login['href']); ?>" >
-                <?php p($login['name']); ?>
+            <a class="button <?php p(isset($login['style']) ? $login['style'] : ''); ?>" href="<?php print_unescaped($login['href']); ?>" >
+                <?php echo $login['name']; ?>
             </a>
         <?php endforeach; ?>
     </div>