diff --git a/data/web/templates/modals/footer.twig b/data/web/templates/modals/footer.twig
index d1e794b8..f5e51d2e 100644
--- a/data/web/templates/modals/footer.twig
+++ b/data/web/templates/modals/footer.twig
@@ -12,7 +12,7 @@
             <input type="text" class="form-control" name="key_id" placeholder="{{ lang.tfa.key_id }}" autocomplete="off" required>
           </div>
           <hr>
-          <p class="help-block">{{ lang.tfa.api_register|format(ui_texts.main_name) }}</p>
+          <p class="help-block">{{ lang.tfa.api_register|format(ui_texts.main_name)|raw }}</p>
           <div class="form-group">
             <input type="text" class="form-control" name="yubico_id" placeholder="Yubico API ID" autocomplete="off" required>
           </div>
diff --git a/data/web/templates/tfa_keys.twig b/data/web/templates/tfa_keys.twig
index 8cefbbb8..ad631725 100644
--- a/data/web/templates/tfa_keys.twig
+++ b/data/web/templates/tfa_keys.twig
@@ -6,7 +6,7 @@
         <p>
           <span style="padding:4px;margin:4px" class="label label-keys label-{% if tfa_id == key_info.id %}success{% else %}default{% endif %}">
             {{ key_info.key_id }}
-            <a href="#" style="font-weight:bold;color:white" onClick="$(this).closest('form').submit()">[{{ lang.admin.remove }}]</a>
+            <a href="#" style="font-weight:bold;color:white" onClick='return confirm("{{ lang.admin.ays }}")?$(this).closest("form").submit():"";'>[{{ lang.admin.remove }}]</a>
           </span>
         </p>
       </form>