diff --git a/src/Umbraco.Infrastructure/Install/InstallSteps/DatabaseInstallStep.cs b/src/Umbraco.Infrastructure/Install/InstallSteps/DatabaseInstallStep.cs
index 0976e14112..96d2a7c996 100644
--- a/src/Umbraco.Infrastructure/Install/InstallSteps/DatabaseInstallStep.cs
+++ b/src/Umbraco.Infrastructure/Install/InstallSteps/DatabaseInstallStep.cs
@@ -1,28 +1,24 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Microsoft.Extensions.Options;
 using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Install;
 using Umbraco.Cms.Core.Install.Models;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.Migrations.Install;
-using Umbraco.Cms.Infrastructure.Persistence;
 
 namespace Umbraco.Cms.Infrastructure.Install.InstallSteps
 {
-    [InstallSetupStep(InstallationType.NewInstall | InstallationType.Upgrade,
-        "DatabaseInstall", 11, "")]
+    [InstallSetupStep(InstallationType.NewInstall | InstallationType.Upgrade, "DatabaseInstall", 11, "")]
     public class DatabaseInstallStep : InstallSetupStep<object>
     {
-        private readonly DatabaseBuilder _databaseBuilder;
         private readonly IRuntimeState _runtime;
+        private readonly DatabaseBuilder _databaseBuilder;
 
-        public DatabaseInstallStep(DatabaseBuilder databaseBuilder, IRuntimeState runtime)
+        public DatabaseInstallStep(IRuntimeState runtime, DatabaseBuilder databaseBuilder)
         {
-            _databaseBuilder = databaseBuilder;
             _runtime = runtime;
+            _databaseBuilder = databaseBuilder;
         }
 
         public override Task<InstallSetupResult> ExecuteAsync(object model)
@@ -47,10 +43,10 @@ namespace Umbraco.Cms.Infrastructure.Install.InstallSteps
                 return Task.FromResult<InstallSetupResult>(null);
             }
 
-            //upgrade is required so set the flag for the next step
+            // Upgrade is required, so set the flag for the next step
             return Task.FromResult(new InstallSetupResult(new Dictionary<string, object>
             {
-                {"upgrade", true}
+                { "upgrade", true}
             }));
         }
 
diff --git a/src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs b/src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
index 0a1def06ef..f9e36d8d12 100644
--- a/src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
+++ b/src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
@@ -1,7 +1,9 @@
 using System;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Configuration;
+using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Core.Migrations;
 using Umbraco.Cms.Core.Scoping;
@@ -25,6 +27,8 @@ namespace Umbraco.Cms.Infrastructure.Migrations.Install
         private readonly ILogger<DatabaseBuilder> _logger;
         private readonly IDbProviderFactoryCreator _dbProviderFactoryCreator;
         private readonly IConfigManipulator _configManipulator;
+        private readonly IOptionsMonitor<GlobalSettings> _globalSettings;
+        private readonly IOptionsMonitor<ConnectionStrings> _connectionStrings;
         private readonly IMigrationPlanExecutor _migrationPlanExecutor;
         private readonly DatabaseSchemaCreatorFactory _databaseSchemaCreatorFactory;
 
@@ -41,6 +45,8 @@ namespace Umbraco.Cms.Infrastructure.Migrations.Install
             IKeyValueService keyValueService,
             IDbProviderFactoryCreator dbProviderFactoryCreator,
             IConfigManipulator configManipulator,
+            IOptionsMonitor<GlobalSettings> globalSettings,
+            IOptionsMonitor<ConnectionStrings> connectionStrings,
             IMigrationPlanExecutor migrationPlanExecutor,
             DatabaseSchemaCreatorFactory databaseSchemaCreatorFactory)
         {
@@ -51,6 +57,8 @@ namespace Umbraco.Cms.Infrastructure.Migrations.Install
             _keyValueService = keyValueService;
             _dbProviderFactoryCreator = dbProviderFactoryCreator;
             _configManipulator = configManipulator;
+            _globalSettings = globalSettings;
+            _connectionStrings = connectionStrings;
             _migrationPlanExecutor = migrationPlanExecutor;
             _databaseSchemaCreatorFactory = databaseSchemaCreatorFactory;
         }
@@ -74,8 +82,8 @@ namespace Umbraco.Cms.Infrastructure.Migrations.Install
         /// </summary>
         public bool CanConnect(string databaseType, string connectionString, string server, string database, string login, string password, bool integratedAuth)
         {
-            // we do not test SqlCE connection
-            if (databaseType.InvariantContains("sqlce") || databaseType.InvariantContains("localdb"))
+            // we do not test SqlCE or LocalDB connections
+            if (databaseType.InvariantContains("SqlCe") || databaseType.InvariantContains("SqlLocalDb"))
                 return true;
 
             string providerName;
@@ -147,10 +155,7 @@ namespace Umbraco.Cms.Infrastructure.Migrations.Install
             const string providerName = Constants.DbProviderNames.SqlCe;
 
             _configManipulator.SaveConnectionString(connectionString, providerName);
-            _databaseFactory.Configure(connectionString, providerName);
-
-            // Always create embedded database
-            CreateDatabase();
+            Configure(connectionString, providerName, true);
         }
 
         public const string LocalDbConnectionString = @"Server=(localdb)\MSSQLLocalDB;Integrated Security=true;AttachDbFileName=|DataDirectory|\Umbraco.mdf";
@@ -161,10 +166,7 @@ namespace Umbraco.Cms.Infrastructure.Migrations.Install
             const string providerName = Constants.DbProviderNames.SqlServer;
 
             _configManipulator.SaveConnectionString(connectionString, providerName);
-            _databaseFactory.Configure(connectionString, providerName);
-
-            // Always create LocalDB database
-            CreateDatabase();
+            Configure(connectionString, providerName, true);
         }
 
         /// <summary>
@@ -174,10 +176,8 @@ namespace Umbraco.Cms.Infrastructure.Migrations.Install
         /// <remarks>Has to be SQL Server</remarks>
         public void ConfigureDatabaseConnection(string connectionString)
         {
-            const string providerName = Constants.DbProviderNames.SqlServer;
-
-            _configManipulator.SaveConnectionString(connectionString, providerName);
-            _databaseFactory.Configure(connectionString, providerName);
+            _configManipulator.SaveConnectionString(connectionString, null);
+            Configure(connectionString, null, _globalSettings.CurrentValue.InstallMissingDatabase);
         }
 
         /// <summary>
@@ -193,7 +193,21 @@ namespace Umbraco.Cms.Infrastructure.Migrations.Install
             var connectionString = GetDatabaseConnectionString(server, databaseName, user, password, databaseProvider, out var providerName);
 
             _configManipulator.SaveConnectionString(connectionString, providerName);
-            _databaseFactory.Configure(connectionString, providerName);
+            Configure(connectionString, providerName, _globalSettings.CurrentValue.InstallMissingDatabase);
+        }
+
+        private void Configure(string connectionString, string providerName, bool installMissingDatabase)
+        {
+            // Update existing connection string
+            var umbracoConnectionString = new ConfigConnectionString(Constants.System.UmbracoConnectionName, connectionString, providerName);
+            _connectionStrings.CurrentValue.UmbracoConnectionString = umbracoConnectionString;
+
+            _databaseFactory.Configure(umbracoConnectionString.ConnectionString, umbracoConnectionString.ProviderName);
+
+            if (installMissingDatabase)
+            {
+                CreateDatabase();
+            }
         }
 
         /// <summary>