diff --git a/src/Api/settings.Preview.json b/src/Api/settings.Preview.json
index ddc6d3c3d8..ebe1db52d5 100644
--- a/src/Api/settings.Preview.json
+++ b/src/Api/settings.Preview.json
@@ -4,7 +4,7 @@
       "vault": "https://preview-vault.bitwarden.com",
       "api": "https://preview-api.bitwarden.com",
       "identity": "https://preview-identity.bitwarden.com",
-      "identityInternal": "https://preview-identity.bitwarden.com"
+      "internalIdentity": "https://preview-identity.bitwarden.com"
     }
   }
 }
diff --git a/src/Api/settings.Production.json b/src/Api/settings.Production.json
index 58866c8fc9..e0dbff6b09 100644
--- a/src/Api/settings.Production.json
+++ b/src/Api/settings.Production.json
@@ -4,7 +4,7 @@
       "vault": "https://vault.bitwarden.com",
       "api": "https://api.bitwarden.com",
       "identity": "https://identity.bitwarden.com",
-      "identityInternal": "https://identity.bitwarden.com"
+      "internalIdentity": "https://identity.bitwarden.com"
     },
     "braintree": {
       "production": true
diff --git a/src/Api/settings.Staging.json b/src/Api/settings.Staging.json
index 5d31355e3f..87ace9ae2a 100644
--- a/src/Api/settings.Staging.json
+++ b/src/Api/settings.Staging.json
@@ -4,7 +4,7 @@
       "vault": "https://vault.bitwarden.com",
       "api": "https://api.bitwarden.com",
       "identity": "https://identity.bitwarden.com",
-      "identityInternal": "https://identity.bitwarden.com"
+      "internalIdentity": "https://identity.bitwarden.com"
     }
   }
 }
diff --git a/src/Billing/settings.Production.json b/src/Billing/settings.Production.json
index 58866c8fc9..e0dbff6b09 100644
--- a/src/Billing/settings.Production.json
+++ b/src/Billing/settings.Production.json
@@ -4,7 +4,7 @@
       "vault": "https://vault.bitwarden.com",
       "api": "https://api.bitwarden.com",
       "identity": "https://identity.bitwarden.com",
-      "identityInternal": "https://identity.bitwarden.com"
+      "internalIdentity": "https://identity.bitwarden.com"
     },
     "braintree": {
       "production": true
diff --git a/src/Core/Services/Implementations/LicensingService.cs b/src/Core/Services/Implementations/LicensingService.cs
index 13b31852ad..0974ba07d0 100644
--- a/src/Core/Services/Implementations/LicensingService.cs
+++ b/src/Core/Services/Implementations/LicensingService.cs
@@ -49,7 +49,7 @@ namespace Bit.Core.Services
                 throw new Exception("Invalid licensing certificate.");
             }
 
-            if(!CoreHelpers.SettingHasValue(_globalSettings.LicenseDirectory))
+            if(_globalSettings.SelfHosted && !CoreHelpers.SettingHasValue(_globalSettings.LicenseDirectory))
             {
                 throw new InvalidOperationException("No license directory.");
             }
diff --git a/src/Identity/settings.Preview.json b/src/Identity/settings.Preview.json
index ddc6d3c3d8..ebe1db52d5 100644
--- a/src/Identity/settings.Preview.json
+++ b/src/Identity/settings.Preview.json
@@ -4,7 +4,7 @@
       "vault": "https://preview-vault.bitwarden.com",
       "api": "https://preview-api.bitwarden.com",
       "identity": "https://preview-identity.bitwarden.com",
-      "identityInternal": "https://preview-identity.bitwarden.com"
+      "internalIdentity": "https://preview-identity.bitwarden.com"
     }
   }
 }
diff --git a/src/Identity/settings.Production.json b/src/Identity/settings.Production.json
index 58866c8fc9..e0dbff6b09 100644
--- a/src/Identity/settings.Production.json
+++ b/src/Identity/settings.Production.json
@@ -4,7 +4,7 @@
       "vault": "https://vault.bitwarden.com",
       "api": "https://api.bitwarden.com",
       "identity": "https://identity.bitwarden.com",
-      "identityInternal": "https://identity.bitwarden.com"
+      "internalIdentity": "https://identity.bitwarden.com"
     },
     "braintree": {
       "production": true
diff --git a/src/Identity/settings.Staging.json b/src/Identity/settings.Staging.json
index 5d31355e3f..87ace9ae2a 100644
--- a/src/Identity/settings.Staging.json
+++ b/src/Identity/settings.Staging.json
@@ -4,7 +4,7 @@
       "vault": "https://vault.bitwarden.com",
       "api": "https://api.bitwarden.com",
       "identity": "https://identity.bitwarden.com",
-      "identityInternal": "https://identity.bitwarden.com"
+      "internalIdentity": "https://identity.bitwarden.com"
     }
   }
 }
diff --git a/src/Jobs/settings.Preview.json b/src/Jobs/settings.Preview.json
index ddc6d3c3d8..ebe1db52d5 100644
--- a/src/Jobs/settings.Preview.json
+++ b/src/Jobs/settings.Preview.json
@@ -4,7 +4,7 @@
       "vault": "https://preview-vault.bitwarden.com",
       "api": "https://preview-api.bitwarden.com",
       "identity": "https://preview-identity.bitwarden.com",
-      "identityInternal": "https://preview-identity.bitwarden.com"
+      "internalIdentity": "https://preview-identity.bitwarden.com"
     }
   }
 }
diff --git a/src/Jobs/settings.Production.json b/src/Jobs/settings.Production.json
index 58866c8fc9..e0dbff6b09 100644
--- a/src/Jobs/settings.Production.json
+++ b/src/Jobs/settings.Production.json
@@ -4,7 +4,7 @@
       "vault": "https://vault.bitwarden.com",
       "api": "https://api.bitwarden.com",
       "identity": "https://identity.bitwarden.com",
-      "identityInternal": "https://identity.bitwarden.com"
+      "internalIdentity": "https://identity.bitwarden.com"
     },
     "braintree": {
       "production": true
diff --git a/src/Jobs/settings.Staging.json b/src/Jobs/settings.Staging.json
index 5d31355e3f..87ace9ae2a 100644
--- a/src/Jobs/settings.Staging.json
+++ b/src/Jobs/settings.Staging.json
@@ -4,7 +4,7 @@
       "vault": "https://vault.bitwarden.com",
       "api": "https://api.bitwarden.com",
       "identity": "https://identity.bitwarden.com",
-      "identityInternal": "https://identity.bitwarden.com"
+      "internalIdentity": "https://identity.bitwarden.com"
     }
   }
 }