diff --git a/DepartmentPortal/Common/DesktopTools/MainControls/GenericControlEntityElement.cs b/DepartmentPortal/Common/DesktopTools/MainControls/GenericControlEntityElement.cs
index 81f8d9c..239b548 100644
--- a/DepartmentPortal/Common/DesktopTools/MainControls/GenericControlEntityElement.cs
+++ b/DepartmentPortal/Common/DesktopTools/MainControls/GenericControlEntityElement.cs
@@ -241,7 +241,7 @@ namespace DesktopTools.Controls
 							control = new BaseControlEnum(property.Name, attribute.MustHaveValue, attribute.ReadOnly, property.PropertyType);
 							break;
 						case ControlType.ControlGuid:
-							if (attribute.ControlTypeObject.IsNotEmpty())
+							if (attribute.ControlTypeObject.IsNotEmpty() && Type.GetType(attribute.ControlTypeObject) != null)
 							{
 								control = new BaseControlGuid(property.Name, attribute.MustHaveValue, attribute.ReadOnly,
 									DependencyManager.Instance.Resolve(Type.GetType(attribute.ControlTypeObject)) as IControlEntitySelectable, 
diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/AccessViewModels.cs b/DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/AccessViewModels.cs
index ab77fbe..0627066 100644
--- a/DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/AccessViewModels.cs
+++ b/DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/AccessViewModels.cs
@@ -17,7 +17,7 @@ namespace SecurityBusinessLogic.ViewModels
 	public class AccessViewModel : ElementViewModel
 	{
 		[MapConfiguration("RoleId", AllowCopyWithoutRigth = false)]
-		[ViewModelControlElementProperty("Роль", ControlType.ControlGuid, MustHaveValue = true, ReadOnly = true, ControlTypeObject = "SecurityWindowsDesktop.Controls.ControlRoleList, SecurityWindowsDesktop")]
+		[ViewModelControlElementProperty("Роль", ControlType.ControlGuid, MustHaveValue = true, ReadOnly = true, ControlTypeObject = "SecurityWindowsDesktop.EntityControls.ControlRoleList, SecurityWindowsDesktop")]
 		public Guid RoleId { get; set; }
 
 		[ViewModelControlListProperty("Роль", 100)]
diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/RoleViewModels.cs b/DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/RoleViewModels.cs
index 8a10d24..dd08b4b 100644
--- a/DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/RoleViewModels.cs
+++ b/DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/RoleViewModels.cs
@@ -14,9 +14,9 @@ namespace SecurityBusinessLogic.ViewModels
 	/// </summary>
 	[ViewModelControlElementClass(HaveDependenceEntities = true, Width = 800, Height = 500)]
 	[ViewModelControlElementDependenceEntity(Title = "Доступы", Order = 1, ParentPropertyName = "RoleId", 
-		ControlTypeObject = "SecurityWindowsDesktop.Controls.ControlAccessList, SecurityWindowsDesktop")]
+		ControlTypeObject = "SecurityWindowsDesktop.EntityControls.ControlAccessList, SecurityWindowsDesktop")]
 	[ViewModelControlElementDependenceEntity(Title = "Пользователи", Order = 2, ParentPropertyName = "RoleId",
-		ControlTypeObject = "SecurityWindowsDesktop.Controls.ControlRoleUserList, SecurityWindowsDesktop")]
+		ControlTypeObject = "SecurityWindowsDesktop.EntityControls.ControlRoleUserList, SecurityWindowsDesktop")]
 	public class RoleViewModel : ElementViewModel
 	{
 		[ViewModelControlListProperty("Название роли")]
diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/UserRoleViewModels.cs b/DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/UserRoleViewModels.cs
index dc7312d..013b22e 100644
--- a/DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/UserRoleViewModels.cs
+++ b/DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/UserRoleViewModels.cs
@@ -17,7 +17,7 @@ namespace SecurityBusinessLogic.ViewModels
     public class UserRoleViewModel : ElementViewModel
     {
         [MapConfiguration("UserId", AllowCopyWithoutRigth = false)]
-        [ViewModelControlElementProperty("Пользователь", ControlType.ControlGuid, MustHaveValue = true, ReadOnly = false, ControlTypeObject = "SecurityWindowsDesktop.Controls.ControlUserList, SecurityWindowsDesktop")]
+        [ViewModelControlElementProperty("Пользователь", ControlType.ControlGuid, MustHaveValue = true, ReadOnly = false, ControlTypeObject = "SecurityWindowsDesktop.EntityControls.ControlUserList, SecurityWindowsDesktop")]
         public Guid UserId { get; set; }
 
         [ViewModelControlListProperty("Пользователь")]
@@ -25,7 +25,7 @@ namespace SecurityBusinessLogic.ViewModels
         public string UserName { get; set; }
 
         [MapConfiguration("RoleId", AllowCopyWithoutRigth = false)]
-        [ViewModelControlElementProperty("Роль", ControlType.ControlGuid, MustHaveValue = true, ReadOnly = false, ControlTypeObject = "SecurityWindowsDesktop.Controls.ControlRoleList, SecurityWindowsDesktop")]
+        [ViewModelControlElementProperty("Роль", ControlType.ControlGuid, MustHaveValue = true, ReadOnly = false, ControlTypeObject = "SecurityWindowsDesktop.EntityControls.ControlRoleList, SecurityWindowsDesktop")]
         public Guid RoleId { get; set; }
 
         [ViewModelControlListProperty("Роль")]
diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/UserViewModels.cs b/DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/UserViewModels.cs
index 3f7c3c7..8503f6b 100644
--- a/DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/UserViewModels.cs
+++ b/DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/UserViewModels.cs
@@ -15,7 +15,7 @@ namespace SecurityBusinessLogic.ViewModels
     /// </summary>
 	[ViewModelControlElementClass(HaveDependenceEntities = true, Width = 800, Height = 500)]
     [ViewModelControlElementDependenceEntity(Title = "Роли", Order = 1, ParentPropertyName = "UserId",
-        ControlTypeObject = "SecurityWindowsDesktop.Controls.ControlUserRoleList, SecurityWindowsDesktop")]
+        ControlTypeObject = "SecurityWindowsDesktop.EntityControls.ControlUserRoleList, SecurityWindowsDesktop")]
     public class UserViewModel : ElementViewModel
     {
         [ViewModelControlListProperty("Пользователь")]