diff --git a/400-SOURCECODE/AIAHTML5.API/Controllers/AuthenticateController.cs b/400-SOURCECODE/AIAHTML5.API/Controllers/AuthenticateController.cs
index 10d65b9..86f130b 100644
--- a/400-SOURCECODE/AIAHTML5.API/Controllers/AuthenticateController.cs
+++ b/400-SOURCECODE/AIAHTML5.API/Controllers/AuthenticateController.cs
@@ -182,7 +182,9 @@ using System.Data.SqlClient;namespace AIAHTML5.API.Controllers
 
         private static void GetModulesBasedOnUserType(User userInfo)
         {
-            if (userInfo.UserType == AIAHTML5.API.Models.User.SUPER_ADMIN || userInfo.UserType == AIAHTML5.API.Models.User.GENERAL_ADMIN)
+            //based on old .net code(AIA flex), we get modules based on licenseId if licenseid>0.
+            //we verified in database that only superadmin has no licenseid so getting all modules for supeadmin
+            if (userInfo.UserType == AIAHTML5.API.Models.User.SUPER_ADMIN)
             {
                 userInfo.Modules = AIAHTML5.API.Models.Users.getAllModulesList();
 
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index e328151..5f6a57b 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -220,7 +220,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                          }
                          else {
                             
-                                 if (result.UserType == UserTypeConstants.SUPER_ADMIN || result.UserType == UserTypeConstants.GENERAL_ADMIN && result.IsActive) { //(!result.IsSubscriptionExpired) && 
+                                 if (result.UserType == UserTypeConstants.SUPER_ADMIN && result.IsActive) { //(!result.IsSubscriptionExpired) && 
                                      $rootScope.userData = result;
                                      $rootScope.userModules = result.Modules;
                                      $rootScope.isVisibleLogin = false;
@@ -354,7 +354,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
 
                 if (userInfo.LoginId != undefined || userInfo.LoginId != "" || userInfo.LoginId != null) {
                     
-                    if (userInfo.UserType == UserTypeConstants.SUPER_ADMIN || userInfo.UserType == UserTypeConstants.GENERAL_ADMIN && result.IsActive) { //(!result.IsSubscriptionExpired) && 
+                    if (userInfo.UserType == UserTypeConstants.SUPER_ADMIN  && result.IsActive) { //(!result.IsSubscriptionExpired) && 
                       
                         $rootScope.userData = userInfo;
                        
diff --git a/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css b/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
index 7a57e0d..34a1702 100644
--- a/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
+++ b/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
@@ -1087,4 +1087,10 @@ color:#ffffff !important;
 .jsPanel-btn-norm
  {
     background-image: none !important;
-}
\ No newline at end of file
+}
+.modal-small
+ {
+ 	
+  width : 400px !important;
+ 	
+ }
\ No newline at end of file