diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Views/EditorTemplates/Parts/Roles.UserRoles.cshtml b/src/Orchard.Web/Modules/Orchard.Roles/Views/EditorTemplates/Parts/Roles.UserRoles.cshtml
index b8f8a28b8..de1414ef7 100644
--- a/src/Orchard.Web/Modules/Orchard.Roles/Views/EditorTemplates/Parts/Roles.UserRoles.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Views/EditorTemplates/Parts/Roles.UserRoles.cshtml
@@ -1,21 +1,26 @@
 @model UserRolesViewModel
 @using Orchard.Roles.ViewModels
+
 <fieldset>
     <legend>@T("Roles")</legend>
     @if (Model.Roles.Count > 0) {
-           var index = 0;
-           foreach (var entry in Model.Roles) {
-               if (string.Equals(entry.Name, "Authenticated", StringComparison.OrdinalIgnoreCase) || string.Equals(entry.Name, "Anonymous", StringComparison.OrdinalIgnoreCase)) {
-                   continue;
-               }
-    Html.Hidden("Roles[" + index + "].RoleId", entry.RoleId);
-    Html.Hidden("Roles[" + index + "].Name", entry.Name);
+        var index = 0;
+        foreach (var entry in Model.Roles) {
+            if (string.Equals(entry.Name, "Authenticated", StringComparison.OrdinalIgnoreCase) || string.Equals(entry.Name, "Anonymous", StringComparison.OrdinalIgnoreCase)) {
+                continue;
+            }
+
+            @Html.Hidden("Roles[" + index + "].RoleId", entry.RoleId)
+            @Html.Hidden("Roles[" + index + "].Name", entry.Name)
+
     <div>
-    @Html.CheckBox("Roles[" + index + "].Granted", entry.Granted)
-    <label class="forcheckbox" for="@"Roles[" + index + "]_Granted"">@entry.Name</label>
+        @Html.CheckBox("Roles[" + index + "].Granted", entry.Granted)
+        <label class="forcheckbox" for="@Html.FieldIdFor(m => m.Roles[index].Granted)">@entry.Name</label>
     </div>
-    @++index;
+            index++;
         }
-       }
-       else {<p>@T("There are no roles.")</p>}
+    }
+    else {
+    <p>@T("There are no roles.")</p>
+    }
 </fieldset>
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs
index d1ddc4a49..aa917f97c 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs
@@ -104,9 +104,11 @@ namespace Orchard.Users.Controllers {
         public ActionResult Edit(int id) {
             if (!Services.Authorizer.Authorize(Permissions.ManageUsers, T("Not authorized to manage users")))
                 return new HttpUnauthorizedResult();
-            
+
+            var user = Services.ContentManager.Get<UserPart>(id);
+
             return View(new UserEditViewModel {
-                User = Services.ContentManager.Get<UserPart>(id)
+                User = Services.ContentManager.BuildEditorModel(user) 
             });
         }
 
@@ -114,9 +116,10 @@ namespace Orchard.Users.Controllers {
         public ActionResult EditPOST(int id) {
             if (!Services.Authorizer.Authorize(Permissions.ManageUsers, T("Not authorized to manage users")))
                 return new HttpUnauthorizedResult();
-            
+
+            var user = Services.ContentManager.Get(id);
             var model = new UserEditViewModel {
-                User = Services.ContentManager.Get<UserPart>(id)
+                User = Services.ContentManager.UpdateEditorModel(user, this)
             };
 
             TryUpdateModel(model);
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Create.cshtml b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Create.cshtml
index b054b7cea..277ffc99a 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Create.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Create.cshtml
@@ -28,6 +28,8 @@
         @Html.ValidationMessageFor(m=>m.ConfirmPassword, "*")
     </fieldset>
 
+    @Display(Model.User)
+
     <fieldset>
         <input class="button primaryAction" type="submit" value="@T("Add")" />
     </fieldset>
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Edit.cshtml
index 7e52c85f5..b138c4af4 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Edit.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Edit.cshtml
@@ -16,6 +16,8 @@
         @Html.ValidationMessageFor(m=>m.Email, "*")
     </fieldset>
 
+    @Display(Model.User)
+
     <fieldset>
         <input class="button primaryAction" type="submit" value="@T("Save") " />
     </fieldset>