diff --git a/src/pretix/control/templates/pretixcontrol/user/2fa_main.html b/src/pretix/control/templates/pretixcontrol/user/2fa_main.html
index 0fd6865f8..3fb117d67 100644
--- a/src/pretix/control/templates/pretixcontrol/user/2fa_main.html
+++ b/src/pretix/control/templates/pretixcontrol/user/2fa_main.html
@@ -47,7 +47,7 @@
     {% endif %}
     <div class="panel panel-default">
         <div class="panel-heading">
-            <h3 class="panel-title">{% trans "Enabled devices" %}</h3>
+            <h3 class="panel-title">{% trans "Registered devices" %}</h3>
         </div>
         <ul class="list-group">
             {% for d in devices %}
diff --git a/src/pretix/control/views/user.py b/src/pretix/control/views/user.py
index 16d6de8c8..92537c4a9 100644
--- a/src/pretix/control/views/user.py
+++ b/src/pretix/control/views/user.py
@@ -232,7 +232,11 @@ class User2FADeviceConfirmU2FView(RecentAuthenticationRequiredMixin, TemplateVie
                 _('A new two-factor authentication device has been added to your account.')
             ])
 
-            messages.success(request, _('The device has been verified and can now be used.'))
+            note = ''
+            if not self.request.user.require_2fa:
+                note = ' ' + _('Please note that you still need to enable two-factor authentication for your account '
+                               'using the buttons below to make a second factor required for logging into your accont.')
+            messages.success(request, _('The device has been verified and can now be used.') + note)
             return redirect(reverse('control:user.settings.2fa'))
         except Exception:
             messages.error(request, _('The registration could not be completed. Please try again.'))