diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Content/synchronizing.gif b/src/Orchard.Web/Modules/Orchard.Setup/Content/synchronizing.gif
new file mode 100644
index 000000000..9fb3552b7
Binary files /dev/null and b/src/Orchard.Web/Modules/Orchard.Setup/Content/synchronizing.gif differ
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj b/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj
index 3c67c661a..9a3f09c68 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj
@@ -74,9 +74,9 @@
     <Compile Include="ViewModels\SetupViewModel.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Setup\Index.cshtml">
-      <SubType>Designer</SubType>
-    </Content>
+    <Content Include="Content\synchronizing.gif" />
+    <Content Include="Scripts\setup.js" />
+    <Content Include="Views\Setup\Index.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
@@ -100,6 +100,16 @@
     <Content Include="Module.txt" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Content\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Scripts\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Scripts/setup.js b/src/Orchard.Web/Modules/Orchard.Setup/Scripts/setup.js
index a9c59453d..c434af37b 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Scripts/setup.js
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Scripts/setup.js
@@ -1 +1,14 @@
-$("#SiteName").closest("form").helpfullyFocus();
\ No newline at end of file
+(function () {
+    function show() {
+        window.setTimeout(function () {
+            document.getElementById("throbber").style.display = "block";
+        }, 2000);
+    }
+
+    if (document.addEventListener) {
+        document.addEventListener("submit", show, false);
+    }
+    else {
+        document.attachEvent("onsubmit", show);
+    }
+})();
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.cshtml
index 3fd26831f..08a9a0836 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.cshtml
@@ -1,5 +1,7 @@
 @model Orchard.Setup.ViewModels.SetupViewModel
-
+@{
+    Script.Include("setup.js");
+}
 <h1>@Html.TitleForPage(T("Get Started").ToString())</h1>
 
 @using (Html.BeginFormAntiForgeryPost()) {
@@ -48,6 +50,18 @@ if (!Model.DatabaseIsPreconfigured) {
     </div>
 </fieldset>
 }
+<div id="throbber">
+    <div class="curtain"></div>
+    <div class="curtain-content">
+        <div>
+            <h1>@T("Configuring Orchard...")</h1>
+            <p>
+                <img src="@Href("../../content/synchronizing.gif")" alt="" />
+            </p>
+        </div>
+    </div>
+</div>
+    
 <fieldset>
     <button class="primaryAction" type="submit">@T("Finish Setup")</button>
 </fieldset>
diff --git a/src/Orchard.Web/Themes/SafeMode/Styles/site.css b/src/Orchard.Web/Themes/SafeMode/Styles/site.css
index e7238cbcd..02f1cc0f8 100644
--- a/src/Orchard.Web/Themes/SafeMode/Styles/site.css
+++ b/src/Orchard.Web/Themes/SafeMode/Styles/site.css
@@ -173,6 +173,34 @@ button:focus::-moz-focus-inner, .button:focus::-moz-focus-inner {
 
 /* Confirmations, Messages and the like
 ***************************************************************/
+#throbber {
+    display:none;
+}
+#throbber .curtain 
+{
+    position:absolute;
+    left:0;
+    top:0;
+    width:100%;
+    height:100%;
+    background-color:Gray;
+    filter:alpha(opacity=70);
+    opacity: 0.7;
+}
+#throbber .curtain-content 
+{
+    position:absolute;
+    left:0;
+    top:0;
+    width:100%;
+    height:100%;
+}
+#throbber .curtain-content div {
+    text-align:center;
+    padding:250px;
+    color:White;
+}
+
 .message, .validation-summary-errors {
     margin:10px 0 4px 0;
     padding:4px;