diff --git a/src/Api/settings.Preview.json b/src/Api/settings.Preview.json
index 43fea18cd..e3fd6e3a5 100644
--- a/src/Api/settings.Preview.json
+++ b/src/Api/settings.Preview.json
@@ -1,9 +1,8 @@
 {
   "globalSettings": {
     "baseVaultUri": "https://preview-vault.bitwarden.com/#",
-    "baseApiUri": "https://preview-api.bitwarden.com/",
     "u2f": {
-      "appId": "https://preview-vault.bitwarden.com"
+      "appId": "https://preview-vault.bitwarden.com/app-id.json"
     }
   }
 }
diff --git a/src/Api/settings.Production.json b/src/Api/settings.Production.json
index 3ee9f6dbf..08a068c6b 100644
--- a/src/Api/settings.Production.json
+++ b/src/Api/settings.Production.json
@@ -1,9 +1,8 @@
 {
   "globalSettings": {
     "baseVaultUri": "https://vault.bitwarden.com/#",
-    "baseApiUri": "https://api.bitwarden.com/",
     "u2f": {
-      "appId": "https://vault.bitwarden.com"
+      "appId": "https://vault.bitwarden.com/app-id.json"
     }
   }
 }
diff --git a/src/Api/settings.Staging.json b/src/Api/settings.Staging.json
index 3ee9f6dbf..08a068c6b 100644
--- a/src/Api/settings.Staging.json
+++ b/src/Api/settings.Staging.json
@@ -1,9 +1,8 @@
 {
   "globalSettings": {
     "baseVaultUri": "https://vault.bitwarden.com/#",
-    "baseApiUri": "https://api.bitwarden.com/",
     "u2f": {
-      "appId": "https://vault.bitwarden.com"
+      "appId": "https://vault.bitwarden.com/app-id.json"
     }
   }
 }
diff --git a/src/Api/settings.json b/src/Api/settings.json
index 37a0820ab..55e2db4b3 100644
--- a/src/Api/settings.json
+++ b/src/Api/settings.json
@@ -47,7 +47,7 @@
       "aKey": "SECRET"
     },
     "u2f": {
-      "appId": "https://localhost:4001"
+      "appId": "https://localhost:4001/app-id.json"
     }
   },
   "IpRateLimitOptions": {
diff --git a/src/Core/Utilities/CoreHelpers.cs b/src/Core/Utilities/CoreHelpers.cs
index b958d8ef3..0bb443ecf 100644
--- a/src/Core/Utilities/CoreHelpers.cs
+++ b/src/Core/Utilities/CoreHelpers.cs
@@ -123,7 +123,6 @@ namespace Bit.Core.Utilities
         public static string U2fAppIdUrl(GlobalSettings globalSettings)
         {
             return globalSettings.U2f.AppId;
-            //return "https://localhost:4001/app-id.fidou2f";
         }
     }
 }
diff --git a/src/Identity/settings.Preview.json b/src/Identity/settings.Preview.json
index 3e61d2d4c..e3fd6e3a5 100644
--- a/src/Identity/settings.Preview.json
+++ b/src/Identity/settings.Preview.json
@@ -1,5 +1,8 @@
 {
   "globalSettings": {
-    "baseVaultUri": "https://preview-vault.bitwarden.com/#"
+    "baseVaultUri": "https://preview-vault.bitwarden.com/#",
+    "u2f": {
+      "appId": "https://preview-vault.bitwarden.com/app-id.json"
+    }
   }
 }
diff --git a/src/Identity/settings.Production.json b/src/Identity/settings.Production.json
index 8cb3e0000..08a068c6b 100644
--- a/src/Identity/settings.Production.json
+++ b/src/Identity/settings.Production.json
@@ -1,5 +1,8 @@
 {
   "globalSettings": {
-    "baseVaultUri": "https://vault.bitwarden.com/#"
+    "baseVaultUri": "https://vault.bitwarden.com/#",
+    "u2f": {
+      "appId": "https://vault.bitwarden.com/app-id.json"
+    }
   }
 }
diff --git a/src/Identity/settings.Staging.json b/src/Identity/settings.Staging.json
index 8cb3e0000..08a068c6b 100644
--- a/src/Identity/settings.Staging.json
+++ b/src/Identity/settings.Staging.json
@@ -1,5 +1,8 @@
 {
   "globalSettings": {
-    "baseVaultUri": "https://vault.bitwarden.com/#"
+    "baseVaultUri": "https://vault.bitwarden.com/#",
+    "u2f": {
+      "appId": "https://vault.bitwarden.com/app-id.json"
+    }
   }
 }
diff --git a/src/Identity/settings.json b/src/Identity/settings.json
index 738b32619..1dae623b3 100644
--- a/src/Identity/settings.json
+++ b/src/Identity/settings.json
@@ -43,7 +43,7 @@
       "aKey": "SECRET"
     },
     "u2f": {
-      "appId": "https://localhost:4001"
+      "appId": "https://localhost:4001/app-id.json"
     }
   }
 }