diff --git a/core/css/guest.css b/core/css/guest.css
index 6553dbd48e..c238c3a8e2 100644
--- a/core/css/guest.css
+++ b/core/css/guest.css
@@ -159,7 +159,7 @@ form #datadirField legend {
 }
 
 #alternative-logins a {
-	margin: 5px;
+	margin: 10px 5px;
 	display: block;
 	font-size: 15px;
 }
diff --git a/core/templates/login.php b/core/templates/login.php
index 8a426b492e..10d5087fd0 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -3,12 +3,16 @@
 script('core', 'dist/login');
 ?>
 
-<?php if (!empty($_['alt_login'])) { ?>
-	<div id="alternative-logins">
-		<?php foreach($_['alt_login'] as $login): ?>
-			<a class="button primary" href="<?php print_unescaped($login['href']); ?>" ><?php p($login['name']); ?></a>
-		<?php endforeach; ?>
-	</div>
-<?php } ?>
 
 <div id="login"></div>
+
+<?php if (!empty($_['alt_login'])) { ?>
+    <div id="alternative-logins">
+        <?php foreach($_['alt_login'] as $login): ?>
+            <a class="button primary" href="<?php print_unescaped($login['href']); ?>" >
+                <?php p($l->t('Log in with')) ?>
+                <?php p($login['name']); ?>
+            </a>
+        <?php endforeach; ?>
+    </div>
+<?php } ?>