diff --git a/core/css/guest.css b/core/css/guest.css
index 47ceb7b93e..9a2acde2ec 100644
--- a/core/css/guest.css
+++ b/core/css/guest.css
@@ -103,7 +103,7 @@ body {
 /* Default FORM */
 form {
 	position: relative;
-	width: 280px;
+	width: 100%;
 	margin: auto;
 	padding: 0;
 }
@@ -433,7 +433,7 @@ form .warning input[type='checkbox']+label {
 	margin: 0 auto;
 }
 .two-factor-submit {
-	width: 280px;
+	width: 100%;
 	padding: 10px;
 	margin: 0 0 5px 0;
 	border-radius: 3px;
diff --git a/core/templates/twofactorselectchallenge.php b/core/templates/twofactorselectchallenge.php
index a2fc97495a..d0bccfabd6 100644
--- a/core/templates/twofactorselectchallenge.php
+++ b/core/templates/twofactorselectchallenge.php
@@ -6,17 +6,17 @@
 		<strong><?php p($l->t('Could not load at least one of your enabled two-factor auth methods. Please contact your admin.')) ?></strong>
 	</p>
 	<?php endif; ?>
-	<?php if (empty($_['providers'])): ?>
-	<p>
-		<?php if (is_null($_['backupProvider'])): ?>
-		<strong><?php p($l->t('Two-factor authentication is enforced but has not been configured on your account. Contact your admin for assistance.')) ?></strong>
-		<?php else: ?>
-		<strong><?php p($l->t('Two-factor authentication is enforced but has not been configured on your account. Use one of your backup codes to log in or contact your admin for assistance.')) ?></strong>
-		<?php endif; ?>
-	</p>
-	<?php else: ?>
 	<p>
 		<ul>
+			<?php if (empty($_['providers'])): ?>
+			<p>
+				<?php if (is_null($_['backupProvider'])): ?>
+				<strong><?php p($l->t('Two-factor authentication is enforced but has not been configured on your account. Contact your admin for assistance.')) ?></strong>
+				<?php else: ?>
+				<strong><?php p($l->t('Two-factor authentication is enforced but has not been configured on your account. Use one of your backup codes to log in or contact your admin for assistance.')) ?></strong>
+				<?php endif; ?>
+			</p>
+			<?php else: ?>
 			<?php foreach ($_['providers'] as $provider): ?>
 				<li>
 					<a class="two-factor-provider"