diff --git a/apps/twofactor_backupcodes/css/style.css b/apps/twofactor_backupcodes/css/style.css
index 0e15290b86..396192b43a 100644
--- a/apps/twofactor_backupcodes/css/style.css
+++ b/apps/twofactor_backupcodes/css/style.css
@@ -5,11 +5,13 @@
 .challenge {
 	margin-top: 0 !important;
 	margin-left: 0 !important;
+	box-sizing: border-box !important;
+	width: 100% !important;
 }
 
 .confirm-inline {
 	position: absolute;
-	right: 10px;
+	right: 0;
 	top: 0;
 	margin: 0 !important;
 	padding-right: 25px !important;
diff --git a/core/css/guest.css b/core/css/guest.css
index 657a4adbde..d55d8785b4 100644
--- a/core/css/guest.css
+++ b/core/css/guest.css
@@ -347,8 +347,18 @@ form .warning input[type='checkbox']+label {
 }
 .two-factor-link {
 	display: inline-block;
-	padding: 12px;
 	color: rgba(255, 255, 255, 0.75);
+	width: 100%;
+}
+.two-factor-link .button {
+	padding: 10px;
+	border-radius: 3px;
+	color: #555 !important;
+	display: inline-block;
+	margin: 5px 0;
+	text-align: center;
+	width: 100%;
+	box-sizing: border-box
 }
 
 /* Additional login options */
@@ -453,6 +463,9 @@ form #selectDbType label.ui-state-active {
 	border-radius: 3px;
 	cursor: default;
 }
+.warning {
+	margin-top: 15px;
+}
 .warning.updateAnyways {
 	text-align: center;
 }