diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/UserController.cs b/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/UserController.cs
index 85d9160..af55c23 100644
--- a/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/UserController.cs
+++ b/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/UserController.cs
@@ -49,9 +49,9 @@ namespace AIAHTML5.ADMIN.API.Controllers
         {
             dbContext.Configuration.ProxyCreationEnabled = false;
             try
-            {
+            {            
                 return Ok(dbContext.AIAUsers.Where(u => u.Id == userId).Select(s => new UserModel { 
-                DeactivationDate=s.DeactivationDate.Value,
+                DeactivationDate=s.DeactivationDate,
                 Createdby = dbContext.AIAUsers.Where(sub1 => sub1.Id == s.CreatorId).Select(sub1 => sub1.FirstName ).FirstOrDefault()+ " "+ dbContext.AIAUsers.Where(sub1 => sub1.Id == s.CreatorId).Select(sub1 => sub1.LastName).FirstOrDefault(),
                 Modifiedby = dbContext.AIAUsers.Where(sub1 => sub1.Id == s.ModifierId).Select(sub1 => sub1.FirstName ).FirstOrDefault() + " " + dbContext.AIAUsers.Where(sub1 => sub1.Id == s.ModifierId).Select(sub1 => sub1.LastName).FirstOrDefault()
                 }).ToList());
diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/UserGroupController.cs b/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/UserGroupController.cs
index c6c4b8a..0f804ed 100644
--- a/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/UserGroupController.cs
+++ b/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/UserGroupController.cs
@@ -24,7 +24,7 @@ namespace AIAHTML5.ADMIN.API.Controllers
 
         [Route("LicenseUserGroups")]
         [HttpGet]
-        public HttpResponseMessage GetLicenseUserGroups(int LicenseId, int pageNo, int pageLength)
+        public HttpResponseMessage GetLicenseUserGroups(int? LicenseId, int pageNo, int pageLength)
         {
             List<UserGroupModel> UserGroupList = new List<UserGroupModel>();
             int recordCount = 0;
@@ -42,7 +42,7 @@ namespace AIAHTML5.ADMIN.API.Controllers
 
         [Route("LicenseUserGroupUsers")]
         [HttpGet]
-        public HttpResponseMessage GetLicenseUserGroupUsers(int LicenseId, int UserGroupId, bool AllUsers, int pageNo, int pageLength)
+        public HttpResponseMessage GetLicenseUserGroupUsers(int? LicenseId, int UserGroupId, bool AllUsers, int pageNo, int pageLength)
         {
             List<UserModel> UserList = new List<UserModel>();
             int recordCount = 0;
@@ -142,7 +142,7 @@ namespace AIAHTML5.ADMIN.API.Controllers
 
         [Route("CheckDuplicateLicenseUserGroup")]
         [HttpGet]
-        public HttpResponseMessage CheckDuplicateLicenseUserGroup(int LicenseId, string Title)
+        public HttpResponseMessage CheckDuplicateLicenseUserGroup(int? LicenseId, string Title)
         {
             bool Status = false;
             try
diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.API/Models/UserGroupModel.cs b/400-SOURCECODE/AIAHTML5.ADMIN.API/Models/UserGroupModel.cs
index e94868a..e0a646f 100644
--- a/400-SOURCECODE/AIAHTML5.ADMIN.API/Models/UserGroupModel.cs
+++ b/400-SOURCECODE/AIAHTML5.ADMIN.API/Models/UserGroupModel.cs
@@ -16,7 +16,7 @@ namespace AIAHTML5.ADMIN.API.Models
         public bool? IsActive { get; set; }
         public int? TotalUsers { get; set; }
 
-        public static List<UserGroupModel> GetLicenseUserGroups(AIADatabaseV5Entities dbContext, int LicenseId, int pageNo, int pageLength, out int recordCount)
+        public static List<UserGroupModel> GetLicenseUserGroups(AIADatabaseV5Entities dbContext, int? LicenseId, int pageNo, int pageLength, out int recordCount)
         {
             List<UserGroupModel> UserGroupList = new List<UserGroupModel>();
             UserGroupModel UserGroupObj = new UserGroupModel();
@@ -43,7 +43,7 @@ namespace AIAHTML5.ADMIN.API.Models
             return UserGroupList;
         }
 
-        public static List<UserModel> GetLicenseUserGroupUsers(AIADatabaseV5Entities dbContext, int LicenseId, int UserGroupId, bool AllUsers, int pageNo, int pageLength, out int recordCount)
+        public static List<UserModel> GetLicenseUserGroupUsers(AIADatabaseV5Entities dbContext, int? LicenseId, int UserGroupId, bool AllUsers, int pageNo, int pageLength, out int recordCount)
         {
             List<UserModel> UserList = new List<UserModel>();
             UserModel UserModelObj = new UserModel();
@@ -113,7 +113,7 @@ namespace AIAHTML5.ADMIN.API.Models
             }
         }
 
-        public static bool CheckDuplicateLicenseUserGroup(AIADatabaseV5Entities dbContext, int LicenseId, string Title)
+        public static bool CheckDuplicateLicenseUserGroup(AIADatabaseV5Entities dbContext, int? LicenseId, string Title)
         {
             var spStatus = new System.Data.Objects.ObjectParameter("Status", 0);
             try
diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.API/Models/UserModel.cs b/400-SOURCECODE/AIAHTML5.ADMIN.API/Models/UserModel.cs
index 10b529f..a60fded 100644
--- a/400-SOURCECODE/AIAHTML5.ADMIN.API/Models/UserModel.cs
+++ b/400-SOURCECODE/AIAHTML5.ADMIN.API/Models/UserModel.cs
@@ -19,7 +19,7 @@ namespace AIAHTML5.ADMIN.API.Models
         public string SecurityAnswer { get; set; }
         public int CreatorId { get; set; }
         public DateTime CreationDate { get; set; }
-        public DateTime DeactivationDate { get; set; }
+        public DateTime ? DeactivationDate { get; set; }
         public int ModifierId { get; set; }
         public DateTime ModifiedDate { get; set; }
         public int UserTypeId { get; set; }