diff --git a/src/Api/Api.csproj b/src/Api/Api.csproj
index 4ad8c47ed5..3606b23b15 100644
--- a/src/Api/Api.csproj
+++ b/src/Api/Api.csproj
@@ -7,7 +7,6 @@
     <AssemblyName>Api</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>Api</PackageId>
-    <UserSecretsId>aspnet5-bitwarden-Api</UserSecretsId>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
     <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
diff --git a/src/Api/Startup.cs b/src/Api/Startup.cs
index 60618fb82e..1a653d1ea4 100644
--- a/src/Api/Startup.cs
+++ b/src/Api/Startup.cs
@@ -29,7 +29,7 @@ namespace Bit.Api
         public Startup(IHostingEnvironment env)
         {
             var builder = new ConfigurationBuilder()
-                .AddSettingsConfiguration<Startup>(env);
+                .AddSettingsConfiguration(env, "aspnet5-bitwarden-Api");
             Configuration = builder.Build();
             Environment = env;
         }
diff --git a/src/Billing/Billing.csproj b/src/Billing/Billing.csproj
index 641b89cda1..f0a1c561e6 100644
--- a/src/Billing/Billing.csproj
+++ b/src/Billing/Billing.csproj
@@ -6,7 +6,6 @@
     <AssemblyName>Billing</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>Billing</PackageId>
-    <UserSecretsId>bitwarden-Billing</UserSecretsId>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
     <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@@ -25,6 +24,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.2" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="1.1.1" />
+    <PackageReference Include="System.Net.Http" Version="4.3.1" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/Billing/Startup.cs b/src/Billing/Startup.cs
index 1e31048125..b233798832 100644
--- a/src/Billing/Startup.cs
+++ b/src/Billing/Startup.cs
@@ -16,7 +16,7 @@ namespace Bit.Billing
         public Startup(IHostingEnvironment env)
         {
             var builder = new ConfigurationBuilder()
-                .AddSettingsConfiguration<Startup>(env);
+                .AddSettingsConfiguration(env, "bitwarden-Billing");
             Configuration = builder.Build();
         }
 
diff --git a/src/Core/Utilities/ConfigurationBuilderExtensions.cs b/src/Core/Utilities/ConfigurationBuilderExtensions.cs
index fdbec51869..7b909f6afc 100644
--- a/src/Core/Utilities/ConfigurationBuilderExtensions.cs
+++ b/src/Core/Utilities/ConfigurationBuilderExtensions.cs
@@ -5,9 +5,10 @@ namespace Bit.Core.Utilities
 {
     public static class ConfigurationBuilderExtensions
     {
-        public static IConfigurationBuilder AddSettingsConfiguration<T>(
+        public static IConfigurationBuilder AddSettingsConfiguration(
             this ConfigurationBuilder builder,
-            IHostingEnvironment env) where T : class
+            IHostingEnvironment env,
+            string userSecretsId)
         {
             builder.SetBasePath(env.ContentRootPath)
                 .AddJsonFile("settings.json")
@@ -15,7 +16,7 @@ namespace Bit.Core.Utilities
 
             if(env.IsDevelopment())
             {
-                builder.AddUserSecrets<T>();
+                builder.AddUserSecrets(userSecretsId);
             }
 
             builder.AddEnvironmentVariables();
diff --git a/src/Identity/Identity.csproj b/src/Identity/Identity.csproj
index 066f450f67..c3e3847d6d 100644
--- a/src/Identity/Identity.csproj
+++ b/src/Identity/Identity.csproj
@@ -4,12 +4,12 @@
     <TargetFramework>net461</TargetFramework>
     <AssemblyName>Identity</AssemblyName>
     <RootNamespace>Bit.Identity</RootNamespace>
-    <UserSecretsId>527b1fab-a4b5-465b-881a-f44f08c42899</UserSecretsId>
   </PropertyGroup>
   
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.1" />
+    <PackageReference Include="System.Net.Http" Version="4.3.1" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/Identity/Startup.cs b/src/Identity/Startup.cs
index 03e95900c4..5724c564e6 100644
--- a/src/Identity/Startup.cs
+++ b/src/Identity/Startup.cs
@@ -15,7 +15,7 @@ namespace Bit.Identity
         public Startup(IHostingEnvironment env)
         {
             var builder = new ConfigurationBuilder()
-                .AddSettingsConfiguration<Startup>(env);
+                .AddSettingsConfiguration(env, "527b1fab-a4b5-465b-881a-f44f08c42899");
             Configuration = builder.Build();
             Environment = env;
         }