diff --git a/views/bootstrap/class.Setup2Factor.php b/views/bootstrap/class.Setup2Factor.php
index 6426d1592..478148672 100644
--- a/views/bootstrap/class.Setup2Factor.php
+++ b/views/bootstrap/class.Setup2Factor.php
@@ -102,10 +102,11 @@ $(document).ready( function() {
 				'required'=>true
 			)
 		);
+		$this->formField(
+			getMLText('2_fact_auth_qrcode'),
+			'<img src="'.$tfa->getQRCodeImageAsDataUri($user->getLogin(), $secret).'">'
+		);
 		$this->formSubmit(getMLText('submit_2_fact_auth'));
-		echo '<div class="control-group"><label class="control-label"></label><div class="controls">';
-		echo '<img src="'.$tfa->getQRCodeImageAsDataUri($user->getLogin(), $secret).'">';
-		echo '</div></div>';
 ?>
 </form>
 <?php
@@ -113,8 +114,14 @@ $(document).ready( function() {
 			$this->columnEnd();
 			$this->columnStart(6);
 			$this->contentHeading(getMLText('2_fact_auth_current_secret'));
-			echo '<div>'.htmlspecialchars($oldsecret).'</div>';
-			echo '<div><img src="'.$tfa->getQRCodeImageAsDataUri($sitename, $oldsecret).'"></div>';
+			$this->formField(
+				getMLText('2_fact_auth_secret'),
+				htmlspecialchars($oldsecret)
+			);
+			$this->formField(
+				getMLText('2_fact_auth_qrcode'),
+				'<img src="'.$tfa->getQRCodeImageAsDataUri($user->getLogin(), $secret).'">'
+			);
 ?>
 <?php
 		}