diff --git a/data/web/css/mailcow.css b/data/web/css/mailcow.css
index ee0b5cc6..a47252bc 100644
--- a/data/web/css/mailcow.css
+++ b/data/web/css/mailcow.css
@@ -19,8 +19,9 @@
    text-transform: none;
 }
 .glyphicon-spin {
-    -webkit-animation: spin 1000ms infinite linear;
-    animation: spin 1000ms infinite linear;
+    font-size:12px;
+    -webkit-animation: spin 2000ms infinite linear;
+    animation: spin 2000ms infinite linear;
 }
 @-webkit-keyframes spin {
     0% {
diff --git a/data/web/inc/tfa_modals.php b/data/web/inc/tfa_modals.php
index 4df14078..39c841f5 100644
--- a/data/web/inc/tfa_modals.php
+++ b/data/web/inc/tfa_modals.php
@@ -30,7 +30,8 @@
           <div class="form-group">
             <input type="password" class="form-control" name="confirm_password" id="confirm_password" placeholder="<?=$lang['user']['password_now'];?>" autocomplete="off" required>
           </div>
-          <p>Please enter your current password and use your U2F USB stick to confirm your identity.</p>
+          <hr>
+          <p><?=$lang['tfa']['waiting_usb_register'];?></p>
           <div class="alert alert-danger" style="display:none" id="u2f_return_code"></div>
           <input type="hidden" name="token" id="u2f_register_data"/>
           <input type="hidden" name="tfa_method" value="u2f">
@@ -88,7 +89,7 @@ if (isset($_SESSION['pending_tfa_method'])):
         case "u2f":
       ?>
         <form role="form" method="post" id="u2f_auth_form">
-          <p>Please use your U2F USB stick to confirm your identity now.</p>
+          <p><?=$lang['tfa']['waiting_usb_auth'];?></p>
           <div class="alert alert-danger" style="display:none" id="u2f_return_code"></div>
           <input type="hidden" name="token" id="u2f_auth_data"/>
           <input type="hidden" name="tfa_method" value="u2f">
diff --git a/data/web/lang/lang.de.php b/data/web/lang/lang.de.php
index 5a854fea..30951df0 100644
--- a/data/web/lang/lang.de.php
+++ b/data/web/lang/lang.de.php
@@ -364,6 +364,8 @@ $lang['tfa']['confirm'] = "Bestätigen";
 $lang['tfa']['otp'] = "Einmalpasswort";
 $lang['tfa']['trash_login'] = "Login verwerfen";
 $lang['tfa']['select'] = "Bitte auswählen";
+$lang['tfa']['waiting_usb_auth'] = "<i>Warte auf USB-Gerät...</i><br /><br />Bitte jetzt den vorgesehenen Taster des U2F USB-Gerätes berühren.";
+$lang['tfa']['waiting_usb_register'] = "<i>Warte auf USB-Gerät...</i><br /><br />Bitte zuerst das obere Passwortfeld ausfüllen und erst dann den vorgesehenen Taster des U2F USB-Gerätes berühren.";
 
 $lang['admin']['search_domain_da'] = 'Domains durchsuchen';
 $lang['admin']['restrictions'] = 'Postifx Restriktionen';
diff --git a/data/web/lang/lang.en.php b/data/web/lang/lang.en.php
index 33517144..a5b94f16 100644
--- a/data/web/lang/lang.en.php
+++ b/data/web/lang/lang.en.php
@@ -368,6 +368,8 @@ $lang['tfa']['confirm'] = "Confirm";
 $lang['tfa']['otp'] = "One-time password";
 $lang['tfa']['trash_login'] = "Trash login";
 $lang['tfa']['select'] = "Please select";
+$lang['tfa']['waiting_usb_auth'] = "<i>Waiting for USB device...</i><br /><br />Please tap the button on your U2F USB device now.";
+$lang['tfa']['waiting_usb_register'] = "<i>Waiting for USB device...</i><br /><br />Please enter your password above and confirm your U2F registration by tapping the button on your U2F USB device.";
 
 $lang['admin']['search_domain_da'] = 'Search domains';
 $lang['admin']['restrictions'] = 'Postifx Restrictions';