diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs b/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs
index a8c2faeca..c3d2aa30f 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs
@@ -48,7 +48,6 @@ namespace Orchard.Setup.Controllers {
                 var shellSettings = new ShellSettings {
                                                           Name = "default",
                                                           DataProvider = model.DatabaseOptions ? "SQLite" : "SqlServer",
-                                                          DataFolder = Server.MapPath("~/App_Data"),
                                                           DataConnectionString = model.DatabaseConnectionString
                                                       };
 
@@ -56,7 +55,7 @@ namespace Orchard.Setup.Controllers {
                 // provider: SqlServer or SQLite 
                 // dataFolder: physical path (map before calling). Builtin database will be created in this location
                 // connectionString: optional - if provided the dataFolder is essentially ignored, but should still be passed in
-                _databaseMigrationManager.CreateCoordinator(shellSettings.DataProvider, shellSettings.DataFolder, shellSettings.DataConnectionString);
+                _databaseMigrationManager.CreateCoordinator(shellSettings.DataProvider, Server.MapPath("~/App_Data"), shellSettings.DataConnectionString);
 
                 // creating a standalone environment. 
                 // in theory this environment can be used to resolve any normal components by interface, and those
diff --git a/src/Orchard/Environment/Configuration/ShellSettings.cs b/src/Orchard/Environment/Configuration/ShellSettings.cs
index 61a040999..fc84ab2d7 100644
--- a/src/Orchard/Environment/Configuration/ShellSettings.cs
+++ b/src/Orchard/Environment/Configuration/ShellSettings.cs
@@ -2,14 +2,12 @@
     public interface IShellSettings {
         string Name { get; set; }
         string DataProvider { get; set; }
-        string DataFolder { get; set; }
         string DataConnectionString { get; set; }
     }
 
     public class ShellSettings : IShellSettings {
         public string Name { get; set; }
         public string DataProvider { get; set; }
-        public string DataFolder { get; set; }
         public string DataConnectionString { get; set; }
     }
 }
diff --git a/src/Orchard/Environment/Configuration/ShellSettingsLoader.cs b/src/Orchard/Environment/Configuration/ShellSettingsLoader.cs
index 1197a1499..3dfaa9e50 100644
--- a/src/Orchard/Environment/Configuration/ShellSettingsLoader.cs
+++ b/src/Orchard/Environment/Configuration/ShellSettingsLoader.cs
@@ -67,7 +67,6 @@ namespace Orchard.Environment.Configuration {
             return new ShellSettings {
                                          Name = GetValue(fields, "Name"),
                                          DataProvider = GetValue(fields, "DataProvider"),
-                                         DataFolder = GetValue(fields, "DataFolder"),
                                          DataConnectionString = GetValue(fields, "DataConnectionString")
                                      };
         }
@@ -88,8 +87,9 @@ namespace Orchard.Environment.Configuration {
 
             settingsBuilder.AppendLine(string.Format("Name: {0}", shellSettings.Name));
             settingsBuilder.AppendLine(string.Format("DataProvider: {0}", shellSettings.DataProvider));
-            settingsBuilder.AppendLine(string.Format("DataFolder: {0}", shellSettings.DataFolder));
-            settingsBuilder.AppendLine(string.Format("DataConnectionString: {0}", shellSettings.DataConnectionString));
+
+            if (!string.IsNullOrEmpty(shellSettings.DataConnectionString))
+                settingsBuilder.AppendLine(string.Format("DataConnectionString: {0}", shellSettings.DataConnectionString));
 
             return settingsBuilder.ToString();
         }