diff --git a/src/app/config.js b/src/app/config.js
index 2be595c9f4..1d883e6448 100644
--- a/src/app/config.js
+++ b/src/app/config.js
@@ -207,11 +207,10 @@ angular
                 }
             })
             .state('frontend.login.twoFactor', {
-                url: '^/two-factor',
+                url: '^/two-step',
                 templateUrl: 'app/accounts/views/accountsLoginTwoFactor.html',
                 data: {
-                    pageTitle: 'Log In (Two Factor)',
-                    authorizeTwoFactor: true
+                    pageTitle: 'Log In (Two-step)'
                 }
             })
             .state('frontend.logout', {
diff --git a/src/app/settings/views/settingsTwoStepYubi.html b/src/app/settings/views/settingsTwoStepYubi.html
index 1be959fa66..aac01a4a81 100644
--- a/src/app/settings/views/settingsTwoStepYubi.html
+++ b/src/app/settings/views/settingsTwoStepYubi.html
@@ -40,7 +40,12 @@
             <ul>
                 <li>Web vault</li>
                 <li>Browser Extensions</li>
-                <li>Android</li>
+                <li>
+                    Android with
+                    <a href="https://en.wikipedia.org/wiki/List_of_NFC-enabled_mobile_devices" target="_blank">
+                        NFC capabilities
+                    </a>
+                </li>
             </ul>
         </div>
         <div ng-if="enabled">