diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Index.ascx b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Index.ascx
index c71648210..a4aca06e0 100644
--- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Index.ascx
+++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Index.ascx
@@ -22,8 +22,9 @@
                 } %>
                 <%=Html.ActionLink(T("Edit").ToString(), "edit", new {tenantName = tenant.Name, area = "Orchard.MultiTenancy"}) %><%
                 if (!string.Equals(tenant.Name, "default", StringComparison.OrdinalIgnoreCase)) { //todo: (heskew) base this off the view model so logic on what can be removed and have its state changed stays in the controller
-                %><%=_Encoded(" | ")%>
-                <%=Html.ActionLink(T("Remove").ToString(), "delete", new {tenantName = tenant.Name, area = "Orchard.MultiTenancy"}) %><%
+                %><%--
+                delete not implemented! <%=_Encoded(" | ")%>
+                <%=Html.ActionLink(T("Remove").ToString(), "delete", new {tenantName = tenant.Name, area = "Orchard.MultiTenancy"}) %>--%><%
                 } %>
             </div>
         </div>
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj b/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj
index 075d62dd5..c8561a05b 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj
@@ -97,7 +97,6 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Module.txt" />
-    <Content Include="Scripts\setup.js" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.ascx b/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.ascx
index 551d48fd8..8ac805bab 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.ascx
@@ -1,5 +1,4 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<SetupViewModel>" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Setup.ViewModels"%>
 <h1><%=Html.TitleForPage(_Encoded("Get Started").ToHtmlString())%></h1>
 <%
@@ -9,7 +8,7 @@ using (Html.BeginFormAntiForgeryPost()) { %>
 <fieldset class="site">
     <div>
         <label for="SiteName"><%=_Encoded("What is the name of your site?") %></label>
-        <%=Html.EditorFor(svm => svm.SiteName) %>
+        <%=Html.TextBoxFor(svm => svm.SiteName, new { autofocus = "autofocus" })%>
     </div>
     <div>
         <label for="AdminUsername"><%=_Encoded("Choose a user name:") %></label>
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Scripts/base.js b/src/Orchard.Web/Modules/Orchard.Themes/Scripts/base.js
index 5ee517959..916f30533 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Scripts/base.js
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Scripts/base.js
@@ -3,9 +3,17 @@ jQuery.fn.extend({
     helpfullyFocus: function() {
         var _this = $(this);
         var firstError = _this.find(".input-validation-error").first();
-        return firstError.size() === 1
-            ? firstError.focus()
-            : _this.find("input:text").first().focus();
+        // try to focus the first error on the page
+        if (firstError.size() === 1) {
+            return firstError.focus();
+        }
+        // or, give it up to the browser to autofocus
+        if ('autofocus' in document.createElement('input')) {
+            return;
+        }
+        // otherwise, make the autofocus attribute work
+        var autofocus = _this.find(":input[autofocus=autofocus]").first();
+        return autofocus.focus();
     },
     toggleWhatYouControl: function() {
         var _this = $(this);
@@ -52,4 +60,8 @@ jQuery.fn.extend({
         _this.css({ "position": "absolute", "left": "-9999em" });
         $("body").append(_this);
     });
-})();
\ No newline at end of file
+})();
+// a little better autofocus
+$(function() {
+    $("body").helpfullyFocus();
+});
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/Account/LogOn.ascx b/src/Orchard.Web/Modules/Orchard.Users/Views/Account/LogOn.ascx
index de5f098cd..71020cb5d 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Views/Account/LogOn.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Account/LogOn.ascx
@@ -8,8 +8,8 @@ using (Html.BeginFormAntiForgeryPost(Url.Action("LogOn", new {ReturnUrl = Reques
 <fieldset>
     <legend><%=_Encoded("Account Information")%></legend>
     <div>
-        <label for="username"><%=_Encoded("Username or Email:")%></label>
-        <%= Html.TextBox("userNameOrEmail")%>
+        <label for="userNameOrEmail"><%=_Encoded("Username or Email:")%></label>
+        <%= Html.TextBox("userNameOrEmail", "", new { autofocus = "autofocus" })%>
         <%= Html.ValidationMessage("userNameOrEmail")%>
     </div>
     <div>
@@ -22,5 +22,4 @@ using (Html.BeginFormAntiForgeryPost(Url.Action("LogOn", new {ReturnUrl = Reques
     </div>
     <input type="submit" value="<%=_Encoded("Log On") %>" />
 </fieldset><%
-} %><%
-using (this.Capture("end-of-page-scripts")) { %><script type="text/javascript">$("#username").closest("form").helpfullyFocus();</script><% } %>
\ No newline at end of file
+} %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/Contoso/Views/LogOn.ascx b/src/Orchard.Web/Themes/Contoso/Views/LogOn.ascx
index 7b9d29760..3f52bab68 100644
--- a/src/Orchard.Web/Themes/Contoso/Views/LogOn.ascx
+++ b/src/Orchard.Web/Themes/Contoso/Views/LogOn.ascx
@@ -10,7 +10,7 @@ using (Html.BeginFormAntiForgeryPost(Url.Action("LogOn", new {ReturnUrl = Reques
     <legend><%=_Encoded("Account Information")%></legend>
     <div class="group">
         <label for="username"><%=_Encoded("Username:")%></label>
-        <%= Html.TextBox("username")%>
+        <%= Html.TextBox("username", "", new { autofocus = "autofocus" })%>
         <%= Html.ValidationMessage("username")%>
     </div>
     <div class="group">
@@ -23,5 +23,4 @@ using (Html.BeginFormAntiForgeryPost(Url.Action("LogOn", new {ReturnUrl = Reques
     </div>
     <input type="submit" value="<%=_Encoded("Log On") %>" />
 </fieldset><%
-} %><%
-using (this.Capture("end-of-page-scripts")) { %><script type="text/javascript">$("#username").closest("form").helpfullyFocus();</script><% } %>
\ No newline at end of file
+} %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/Corporate/Views/LogOn.ascx b/src/Orchard.Web/Themes/Corporate/Views/LogOn.ascx
index 7b9d29760..3f52bab68 100644
--- a/src/Orchard.Web/Themes/Corporate/Views/LogOn.ascx
+++ b/src/Orchard.Web/Themes/Corporate/Views/LogOn.ascx
@@ -10,7 +10,7 @@ using (Html.BeginFormAntiForgeryPost(Url.Action("LogOn", new {ReturnUrl = Reques
     <legend><%=_Encoded("Account Information")%></legend>
     <div class="group">
         <label for="username"><%=_Encoded("Username:")%></label>
-        <%= Html.TextBox("username")%>
+        <%= Html.TextBox("username", "", new { autofocus = "autofocus" })%>
         <%= Html.ValidationMessage("username")%>
     </div>
     <div class="group">
@@ -23,5 +23,4 @@ using (Html.BeginFormAntiForgeryPost(Url.Action("LogOn", new {ReturnUrl = Reques
     </div>
     <input type="submit" value="<%=_Encoded("Log On") %>" />
 </fieldset><%
-} %><%
-using (this.Capture("end-of-page-scripts")) { %><script type="text/javascript">$("#username").closest("form").helpfullyFocus();</script><% } %>
\ No newline at end of file
+} %>
\ No newline at end of file