diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-mod/public/js/operation-mod.js b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-mod/public/js/operation-mod.js
index 515f7cb2c..775ddd756 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-mod/public/js/operation-mod.js
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-mod/public/js/operation-mod.js
@@ -509,6 +509,7 @@ var androidOperationModule = function () {
                      deviceGlobalConfigurations["displayOrientation"] = operationData["displayOrientation"];
                      if (deviceGlobalConfigurations["isMultiUserDevice"] === true) {
                          deviceGlobalConfigurations["isLoginRequired"] = operationData["isLoginRequired"];
+                         deviceGlobalConfigurations["tenantDomainName"] = $("#logged-in-user").data("domain");
                          var storeApps = $("#cosu-profile-app-configs-storeapps").data("storeapps");
                          var primaryUserApps = {
                              "username" : "primaryUser",
@@ -522,7 +523,7 @@ var androidOperationModule = function () {
                                  userAppConfigurations[index]["visibleAppList"].split(/,(?![^{]*})/)
                                      .map(function (item) {
                                          var packageName = item.trim();
-                                         if (packageName) {
+                                         if (packageName && storeApps) {
                                              var i;
                                              for (i=0; i<storeApps.length; i++) {
                                                  if (packageName === storeApps[i]["packageName"]) {
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs
index 61ff2beb5..4aa64554c 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs
@@ -1779,7 +1779,7 @@
                                             </label>
                                         </div>
                                         <div id="cosu-global-config-multi-user-enabled"
-                                             class="panel-collapse panel-body collapse-config specific-cosu-global-config-multi-user-enabled"
+                                             class="panel-collapse panel-body collapse-config"
                                              role="tabpanel" style="display: none;">
                                             <div class="wr-input-control">
                                                 <label class="wr-input-control checkbox">
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/public/templates/android-policy-operations.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/public/templates/android-policy-operations.hbs
index c5bba4d10..c32e9099b 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/public/templates/android-policy-operations.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/public/templates/android-policy-operations.hbs
@@ -1509,7 +1509,9 @@
                                             </label>
                                         </div>
                                         <div id="cosu-global-config-multi-user-enabled"
-                                             class="panel-collapse panel-body collapse-config specific-cosu-global-config-multi-user-enabled" role="tabpanel" style="display: none;">
+                                             class="panel-collapse panel-body collapse-config"
+                                             role="tabpanel"
+                                             style="display: none;">
                                             <div class="wr-input-control">
                                                 <label class="wr-input-control checkbox">
                                                     <input id="cosu-global-config-is-is-login-required" type="checkbox"