diff --git a/gulpfile.js b/gulpfile.js
index f2ad7482..ec029db9 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -325,7 +325,8 @@ gulp.task('dist:move', function () {
                 paths.webroot + '**/images/**/*',
                 paths.webroot + 'index.html',
                 paths.webroot + 'u2f-connector.html',
-                paths.webroot + 'favicon.ico'
+                paths.webroot + 'favicon.ico',
+                paths.webroot + 'app-id.fidou2f'
             ],
             dest: paths.dist
         }
@@ -440,6 +441,14 @@ gulp.task('deploy-preview', ['dist'], function () {
 gulp.task('serve', function () {
     connect.server({
         port: 4001,
-        root: ['src']
+        root: ['src'],
+        middleware: function (connect, opt) {
+            return [function (req, res, next) {
+                if (req.originalUrl.indexOf('app-id.fidou2f') > -1) {
+                    res.setHeader('Content-Type', 'application/fido.trusted-apps+json');
+                }
+                next();
+            }];
+        }
     });
 });
diff --git a/src/app-id.fidou2f b/src/app-id.fidou2f
new file mode 100644
index 00000000..71b5b982
--- /dev/null
+++ b/src/app-id.fidou2f
@@ -0,0 +1,15 @@
+{
+  "trustedFacets": [
+    {
+      "version": {
+        "major": 1,
+        "minor": 0
+      },
+      "ids": [
+        "https://localhost:4001",
+        "ios:bundle-id:com.8bit.bitwarden",
+        "android:apk-key-hash:585215fd5153209a7e246f53286035838a0be227"
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/app/accounts/views/accountsLoginTwoFactor.html b/src/app/accounts/views/accountsLoginTwoFactor.html
index 9961e22f..87f5a9c6 100644
--- a/src/app/accounts/views/accountsLoginTwoFactor.html
+++ b/src/app/accounts/views/accountsLoginTwoFactor.html
@@ -149,7 +149,7 @@
         web browser.
     </p>
     Please use a supported web browser (such as Chrome) and/or add additional providers that are better supported
-    across web browsers (such as an Authenticator App).
+    across web browsers (such as an authenticator app).
 </div>
 
 <hr />
diff --git a/src/app/settings.js b/src/app/settings.js
index 693338d2..c8dd51b9 100644
--- a/src/app/settings.js
+++ b/src/app/settings.js
@@ -1,2 +1,2 @@
 angular.module("bit")
-.constant("appSettings", {"apiUri":"https://api.bitwarden.com","identityUri":"https://identity.bitwarden.com","stripeKey":"pk_live_bpN0P37nMxrMQkcaHXtAybJk","version":"1.13.0","environment":"Production"});
+.constant("appSettings", {"apiUri":"https://localhost:44377","identityUri":"https://localhost:44392","stripeKey":"pk_test_KPoCfZXu7mznb9uSCPZ2JpTD","version":"1.13.0","environment":"Development"});
diff --git a/src/app/settings/settingsTwoStepU2fController.js b/src/app/settings/settingsTwoStepU2fController.js
index 82cb88be..26062a1f 100644
--- a/src/app/settings/settingsTwoStepU2fController.js
+++ b/src/app/settings/settingsTwoStepU2fController.js
@@ -25,7 +25,7 @@
         };
 
         $scope.readDevice = function () {
-            if (closed) {
+            if (closed || $scope.enabled) {
                 return;
             }