diff --git a/server/AyaNova/biz/ObjectFields.cs b/server/AyaNova/biz/ObjectFields.cs
index 230329ea..8949d1a4 100644
--- a/server/AyaNova/biz/ObjectFields.cs
+++ b/server/AyaNova/biz/ObjectFields.cs
@@ -78,36 +78,33 @@ namespace AyaNova.Biz
                     l.Add(new ObjectField { Key = "WidgetCustom14", Custom = true });
                     l.Add(new ObjectField { Key = "WidgetCustom15", Custom = true });
                     l.Add(new ObjectField { Key = "WidgetCustom16", Custom = true });
-
-
                     break;
 
                 case USER_KEY:
                     l.Add(new ObjectField { Key = "Name", PropertyName = "Name", SharedLTKey = true, DataType = AyDataType.Text, Hideable = false });
                     l.Add(new ObjectField { Key = "UserEmployeeNumber", PropertyName = "EmployeeNumber", DataType = AyDataType.Text });
                     l.Add(new ObjectField { Key = "AuthorizationRoles", PropertyName = "Roles", Hideable = false, DataType = AyDataType.Enum, EnumType = typeof(AuthorizationRoles).ToString() });
-                    
-                    l.Add(new ObjectField("Roles", false, false));
-                    l.Add(new ObjectField("UserNotes", "Notes"));
-                    l.Add(new ObjectField("UserType", false, false));
-                    l.Add(new ObjectField("Active", true, false));
-                    l.Add(new ObjectField("Tags", true, false));
-                    l.Add(new ObjectField("UserCustom1", false, true, true));
-                    l.Add(new ObjectField("UserCustom2", false, true, true));
-                    l.Add(new ObjectField("UserCustom3", false, true, true));
-                    l.Add(new ObjectField("UserCustom4", false, true, true));
-                    l.Add(new ObjectField("UserCustom5", false, true, true));
-                    l.Add(new ObjectField("UserCustom6", false, true, true));
-                    l.Add(new ObjectField("UserCustom7", false, true, true));
-                    l.Add(new ObjectField("UserCustom8", false, true, true));
-                    l.Add(new ObjectField("UserCustom9", false, true, true));
-                    l.Add(new ObjectField("UserCustom10", false, true, true));
-                    l.Add(new ObjectField("UserCustom11", false, true, true));
-                    l.Add(new ObjectField("UserCustom12", false, true, true));
-                    l.Add(new ObjectField("UserCustom13", false, true, true));
-                    l.Add(new ObjectField("UserCustom14", false, true, true));
-                    l.Add(new ObjectField("UserCustom15", false, true, true));
-                    l.Add(new ObjectField("UserCustom16", false, true, true));
+                    l.Add(new ObjectField { Key = "UserNotes", PropertyName = "Notes", DataType = AyDataType.Text });
+                    l.Add(new ObjectField { Key = "UserUserType", PropertyName = "UserType", Hideable = false, DataType = AyDataType.Enum, EnumType = typeof(UserType).ToString() });
+                    l.Add(new ObjectField { Key = "Active", PropertyName = "Active", DataType = AyDataType.Bool, Hideable = false, SharedLTKey = true });
+                    l.Add(new ObjectField { Key = "Tags", PropertyName = "Tags", DataType = AyDataType.Tags, SharedLTKey = true });
+
+                    l.Add(new ObjectField { Key = "UserCustom1", Custom = true });
+                    l.Add(new ObjectField { Key = "UserCustom2", Custom = true });
+                    l.Add(new ObjectField { Key = "UserCustom3", Custom = true });
+                    l.Add(new ObjectField { Key = "UserCustom4", Custom = true });
+                    l.Add(new ObjectField { Key = "UserCustom5", Custom = true });
+                    l.Add(new ObjectField { Key = "UserCustom6", Custom = true });
+                    l.Add(new ObjectField { Key = "UserCustom7", Custom = true });
+                    l.Add(new ObjectField { Key = "UserCustom8", Custom = true });
+                    l.Add(new ObjectField { Key = "UserCustom9", Custom = true });
+                    l.Add(new ObjectField { Key = "UserCustom10", Custom = true });
+                    l.Add(new ObjectField { Key = "UserCustom11", Custom = true });
+                    l.Add(new ObjectField { Key = "UserCustom12", Custom = true });
+                    l.Add(new ObjectField { Key = "UserCustom13", Custom = true });
+                    l.Add(new ObjectField { Key = "UserCustom14", Custom = true });
+                    l.Add(new ObjectField { Key = "UserCustom15", Custom = true });
+                    l.Add(new ObjectField { Key = "UserCustom16", Custom = true });
                     break;