3 files changed, 8 insertions, 8 deletions
diff --git a/app/Template/twofactor/check.php b/app/Template/twofactor/check.php
index 68a58a6c..b0cb4825 100644
--- a/app/Template/twofactor/check.php
+++ b/app/Template/twofactor/check.php
@@ -5,6 +5,6 @@
     <?= $this->form->text('code', array(), array(), array('placeholder="123456"', 'autofocus'), 'form-numeric') ?>
 
     <div class="form-actions">
-        <input type="submit" value="<?= t('Check my code') ?>" class="btn btn-blue"/>
+        <button type="submit" class="btn btn-blue"><?= t('Check my code') ?></button>
     </div>
 </form>
 \ No newline at end of file
diff --git a/app/Template/twofactor/index.php b/app/Template/twofactor/index.php
index b9ee4b49..6de36514 100644
--- a/app/Template/twofactor/index.php
+++ b/app/Template/twofactor/index.php
@@ -4,12 +4,12 @@
 
 <form method="post" action="<?= $this->url->href('twofactor', $user['twofactor_activated'] == 1 ? 'deactivate' : 'show', array('user_id' => $user['id'])) ?>" autocomplete="off">
     <?= $this->form->csrf() ?>
-    <p><?= t('Two-Factor Provider: ') ?><strong><?= $this->e($provider) ?></strong></p>
+    <p><?= t('Two-Factor Provider: ') ?><strong><?= $this->text->e($provider) ?></strong></p>
     <div class="form-actions">
         <?php if ($user['twofactor_activated'] == 1): ?>
-            <input type="submit" value="<?= t('Disable two-factor authentication') ?>" class="btn btn-red"/>
+            <button type="submit" class="btn btn-red"><?= t('Disable two-factor authentication') ?></button>
         <?php else: ?>
-            <input type="submit" value="<?= t('Enable two-factor authentication') ?>" class="btn btn-blue"/>
+            <button type="submit" class="btn btn-blue"><?= t('Enable two-factor authentication') ?></button>
         <?php endif ?>
     </div>
 </form>
diff --git a/app/Template/twofactor/show.php b/app/Template/twofactor/show.php
index dd72965a..59897e20 100644
--- a/app/Template/twofactor/show.php
+++ b/app/Template/twofactor/show.php
@@ -5,15 +5,15 @@
 <?php if (! empty($secret) || ! empty($qrcode_url) || ! empty($key_url)): ?>
 <div class="listing">
     <?php if (! empty($secret)): ?>
-        <p><?= t('Secret key: ') ?><strong><?= $this->e($secret) ?></strong></p>
+        <p><?= t('Secret key: ') ?><strong><?= $this->text->e($secret) ?></strong></p>
     <?php endif ?>
 
     <?php if (! empty($qrcode_url)): ?>
-        <p><br/><img src="<?= $qrcode_url ?>"/><br/><br/></p>
+        <p><br><img src="<?= $qrcode_url ?>"/><br><br></p>
     <?php endif ?>
 
     <?php if (! empty($key_url)): ?>
-        <p><?= t('This QR code contains the key URI: ') ?><a href="<?= $this->e($key_url) ?>"><?= $this->e($key_url) ?></a></p>
+        <p><?= t('This QR code contains the key URI: ') ?><a href="<?= $this->text->e($key_url) ?>"><?= $this->text->e($key_url) ?></a></p>
     <?php endif ?>
 </div>
 <?php endif ?>
@@ -26,6 +26,6 @@
     <?= $this->form->text('code', array(), array(), array('placeholder="123456"', 'autofocus'), 'form-numeric') ?>
 
     <div class="form-actions">
-        <input type="submit" value="<?= t('Check my code') ?>" class="btn btn-blue"/>
+        <button type="submit" class="btn btn-blue"><?= t('Check my code') ?></button>
     </div>
 </form>
 \ No newline at end of file