diff --git a/app/Controller/TwoFactorController.php b/app/Controller/TwoFactorController.php
index 2038c2691..473838ef2 100644
--- a/app/Controller/TwoFactorController.php
+++ b/app/Controller/TwoFactorController.php
@@ -177,6 +177,7 @@ class TwoFactorController extends UserViewController
 
         $this->response->html($this->helper->layout->app('twofactor/check', array(
             'title' => t('Check two factor authentication code'),
+            'no_layout' => true,
         )));
     }
 
diff --git a/app/Template/twofactor/check.php b/app/Template/twofactor/check.php
index 06801d50a..2c0de97c0 100644
--- a/app/Template/twofactor/check.php
+++ b/app/Template/twofactor/check.php
@@ -1,10 +1,15 @@
-<form method="post" action="<?= $this->url->href('TwoFactorController', 'check', array('user_id' => $this->user->getId())) ?>" autocomplete="off">
-
-    <?= $this->form->csrf() ?>
-    <?= $this->form->label(t('Code'), 'code') ?>
-    <?= $this->form->text('code', array(), array(), array('placeholder="123456"', 'autofocus'), 'form-numeric') ?>
-
-    <div class="form-actions">
-        <button type="submit" class="btn btn-blue"><?= t('Check my code') ?></button>
+<section class="page">
+    <div class="page-header">
+        <h2><?= t('Two factor authentication') ?></h2>
     </div>
-</form>
+    <form method="post" action="<?= $this->url->href('TwoFactorController', 'check', array('user_id' => $this->user->getId())) ?>" autocomplete="off">
+        <?= $this->form->csrf() ?>
+
+        <?= $this->form->label(t('Code'), 'code') ?>
+        <?= $this->form->text('code', array(), array(), array('placeholder="123456"', 'autofocus'), 'form-numeric') ?>
+
+        <div class="form-actions">
+            <button type="submit" class="btn btn-blue"><?= t('Check my code') ?></button>
+        </div>
+    </form>
+</section>
\ No newline at end of file