diff --git a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs
index b135cc68d..c24a6046d 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs
@@ -99,7 +99,8 @@ namespace Orchard.Users.Controllers {
 
             ViewData["PasswordLength"] = MinPasswordLength;
 
-            return View();
+            var shape = _orchardServices.New.Register();
+            return new ShapeResult(this, shape); 
         }
 
         [HttpPost]
@@ -135,7 +136,8 @@ namespace Orchard.Users.Controllers {
             }
 
             // If we got this far, something failed, redisplay form
-            return Register();
+            var shape = _orchardServices.New.Register();
+            return new ShapeResult(this, shape); 
         }
 
         public ActionResult RequestLostPassword() {
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj b/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj
index 7d57aaec9..9703a4744 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj
@@ -89,7 +89,7 @@
     <Content Include="Views\Account\ChallengeEmailSuccess.cshtml" />
     <Content Include="Views\Account\ChallengeEmailSent.cshtml" />
     <Content Include="Views\Account\ChallengeEmailFail.cshtml" />
-    <Content Include="Views\Account\Register.cshtml" />
+    <Content Include="Views\Register.cshtml" />
     <Content Include="Views\Admin\Edit.cshtml" />
     <Content Include="Views\Admin\Create.cshtml" />
     <Content Include="Views\Admin\Index.cshtml" />
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/Account/ChangePassword.cshtml b/src/Orchard.Web/Modules/Orchard.Users/Views/Account/ChangePassword.cshtml
index 592bbaf25..070784f99 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Views/Account/ChangePassword.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Account/ChangePassword.cshtml
@@ -1,7 +1,7 @@
 @model dynamic
 <h1>@Html.TitleForPage(T("Change Password").ToString()) </h1>
 <p>@T("Use the form below to change your password.")</p>
-<p>@T("New passwords are required to be a minimum of {0} characters in length.", ViewData["PasswordLength"] as string) </p>
+<p>@T("New passwords are required to be a minimum of {0} characters in length.", ViewData["PasswordLength"]) </p>
 @Html.ValidationSummary(T("Password change was unsuccessful. Please correct the errors and try again.").ToString())
 @using (Html.BeginFormAntiForgeryPost()) { 
     <fieldset>
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/Account/LostPassword.cshtml b/src/Orchard.Web/Modules/Orchard.Users/Views/Account/LostPassword.cshtml
index 3a3b59413..434952452 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Views/Account/LostPassword.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Account/LostPassword.cshtml
@@ -1,7 +1,7 @@
 @model dynamic
 <h1>@Html.TitleForPage(T("Change Password").ToString()) </h1>
 <p>@T("Use the form below to change your password.")</p>
-<p>@T("New passwords are required to be a minimum of {0} characters in length.", ViewData["PasswordLength"] as string) </p>
+<p>@T("New passwords are required to be a minimum of {0} characters in length.", ViewData["PasswordLength"]) </p>
 @Html.ValidationSummary(T("Password change was unsuccessful. Please correct the errors and try again.").ToString())
 @using (Html.BeginFormAntiForgeryPost()) { 
     <fieldset>
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/Account/Register.cshtml b/src/Orchard.Web/Modules/Orchard.Users/Views/Register.cshtml
similarity index 93%
rename from src/Orchard.Web/Modules/Orchard.Users/Views/Account/Register.cshtml
rename to src/Orchard.Web/Modules/Orchard.Users/Views/Register.cshtml
index 8529f5897..a349f1a0f 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Views/Account/Register.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Register.cshtml
@@ -1,6 +1,6 @@
 <h1>@Html.TitleForPage(T("Create a New Account").ToString())</h1>
 <p>@T("Use the form below to create a new account.")</p>
-<p>@T("Passwords are required to be a minimum of {0} characters in length.", ViewData["PasswordLength"] as string)</p>
+<p>@T("Passwords are required to be a minimum of {0} characters in length.", ViewData["PasswordLength"])</p>
 @Html.ValidationSummary(T("Account creation was unsuccessful. Please correct the errors and try again.").ToString()) 
 @using (Html.BeginFormAntiForgeryPost()) { 
     <fieldset>