diff --git a/src/Orchard.Specs/MultiTenancy.feature b/src/Orchard.Specs/MultiTenancy.feature
index e0f8252e0..a8821ba4e 100644
--- a/src/Orchard.Specs/MultiTenancy.feature
+++ b/src/Orchard.Specs/MultiTenancy.feature
@@ -64,7 +64,7 @@ Scenario: A new tenant with preconfigured database goes to the setup screen
 			| name | value |
 			| Name | Scott |
 			| RequestUrlHost | scott.example.org |
-			| DatabaseOptions | True |
+			| DataProvider | SQLite |
 		And I hit "Save"
 		And I am redirected
 		And I go to "/Setup" on host scott.example.org
diff --git a/src/Orchard.Specs/MultiTenancy.feature.cs b/src/Orchard.Specs/MultiTenancy.feature.cs
index 73d8a51ae..7f8248cb4 100644
--- a/src/Orchard.Specs/MultiTenancy.feature.cs
+++ b/src/Orchard.Specs/MultiTenancy.feature.cs
@@ -225,8 +225,8 @@ this.ScenarioSetup(scenarioInfo);
                         "RequestUrlHost",
                         "scott.example.org"});
             table4.AddRow(new string[] {
-                        "DatabaseOptions",
-                        "True"});
+                        "DataProvider",
+                        "SQLite"});
 #line 63
   testRunner.And("I fill in", ((string)(null)), table4);
 #line 68
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs b/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs
index 9f169087e..2c148d7c1 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs
@@ -51,7 +51,7 @@ namespace Orchard.Setup.Controllers {
 
         public ActionResult Index() {
             var initialSettings = _setupService.Prime();
-            return IndexViewResult(new SetupViewModel { AdminUsername = "admin", DatabaseIsPreconfigured = !(string.IsNullOrEmpty(initialSettings.DataProvider) || string.Equals(initialSettings.DataProvider, "none", StringComparison.OrdinalIgnoreCase))});
+            return IndexViewResult(new SetupViewModel { AdminUsername = "admin", DatabaseIsPreconfigured = !string.IsNullOrEmpty(initialSettings.DataProvider)});
         }
 
         [HttpPost, ActionName("Index")]