diff --git a/src/app/settings/views/settingsTwoStep.html b/src/app/settings/views/settingsTwoStep.html
index 9132abba17..b930ff97d7 100644
--- a/src/app/settings/views/settingsTwoStep.html
+++ b/src/app/settings/views/settingsTwoStep.html
@@ -8,7 +8,7 @@
         </div>
         <div class="box-body">
             The recovery code allows you to access your account in the event that you can no longer use your normal
-            two-step login provider (ex. you lose your device). bitwarden support won't be able to assist you if you lose
+            two-step login provider (ex. you lose your device). bitwarden support will not be able to assist you if you lose
             access to your account. We recommend you write down or print the recovery code and keep it in a safe place.
         </div>
         <div class="box-footer">
diff --git a/src/app/settings/views/settingsTwoStepU2f.html b/src/app/settings/views/settingsTwoStepU2f.html
index cc04e622c2..6e749ae9c6 100644
--- a/src/app/settings/views/settingsTwoStepU2f.html
+++ b/src/app/settings/views/settingsTwoStepU2f.html
@@ -30,6 +30,17 @@
 <form name="submitTwoStepForm" ng-submit="submitTwoStepForm.$valid && submit()" api-form="submitPromise"
       ng-if="authed">
     <div class="modal-body">
+        <div class="callout callout-warning">
+            <h4><i class="fa fa-warning"></i> Warning <i class="fa fa-warning"></i></h4>
+            <p>
+                Due to platform limitations, FIDO U2F cannot be used on all bitwarden applications. You should enable
+                another two-step login provider so that you can access your account when FIDO U2F cannot be used.
+            </p>
+            <p>Supported platforms:</p>
+            <ul>
+                <li>Web vault</li>
+            </ul>
+        </div>
         <div ng-if="enabled">
             <div class="callout callout-success">
                 <h4><i class="fa fa-check-circle"></i> Enabled</h4>
diff --git a/src/app/settings/views/settingsTwoStepYubi.html b/src/app/settings/views/settingsTwoStepYubi.html
index 9e3e2740ae..1be959fa66 100644
--- a/src/app/settings/views/settingsTwoStepYubi.html
+++ b/src/app/settings/views/settingsTwoStepYubi.html
@@ -30,6 +30,19 @@
 <form name="submitTwoStepForm" ng-submit="submitTwoStepForm.$valid && submit(updateModel)" api-form="submitPromise"
       ng-if="authed">
     <div class="modal-body">
+        <div class="callout callout-warning">
+            <h4><i class="fa fa-warning"></i> Warning <i class="fa fa-warning"></i></h4>
+            <p>
+                Due to platform limitations, YubiKeys cannot be used on all bitwarden applications. You should enable
+                another two-step login provider so that you can access your account when YubiKeys cannot be used.
+            </p>
+            <p>Supported platforms:</p>
+            <ul>
+                <li>Web vault</li>
+                <li>Browser Extensions</li>
+                <li>Android</li>
+            </ul>
+        </div>
         <div ng-if="enabled">
             <div class="callout callout-success">
                 <h4><i class="fa fa-check-circle"></i> Enabled</h4>