From e64f0a3312a9311cdd93ffd920439bcf2f2082a8 Mon Sep 17 00:00:00 2001
From: Suha Can <Suha.Can@microsoft.com>
Date: Fri, 5 Mar 2010 12:12:14 -0800
Subject: [PATCH] - Fixing 16263: Cannot Add Admin user to the Administrators
 role

--HG--
branch : dev
---
 .../Modules/Orchard.Users/Controllers/AdminController.cs  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs
index 37ada14fd..d6f95b0ca 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs
@@ -111,8 +111,12 @@ namespace Orchard.Users.Controllers {
                 User = Services.ContentManager.UpdateEditorModel<User>(id, this)
             };
 
-            // apply additional model properties that were posted on form
-            UpdateModel(model);
+            TryUpdateModel(model);
+
+            if (!ModelState.IsValid) {
+                Services.TransactionManager.Cancel();
+                return View(model);
+            }
 
             model.User.Item.NormalizedUserName = model.UserName.ToLower();