diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.role.create/create.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.role.create/create.hbs
index befe1a7d1c..ce2b46759f 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.role.create/create.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.role.create/create.hbs
@@ -39,14 +39,15 @@
 
 {{#zone "content"}}
     {{#if canManage}}
-    <!-- content/body -->
-    <div class="row">
-        <div class="col-md-12">
-            <!-- content -->
-            <div id="role-create-form" class="container col-centered wr-content">
+        <!-- content/body -->
+        <div class="row">
+            <div class="col-md-12">
+                <!-- content -->
+                <div id="role-create-form" data-cloud={{isCloud}} class="container col-centered wr-content
+                ">
                 <div class="wr-form">
                     <p class="page-sub-title">Add Role</p>
-                    <hr />
+                    <hr/>
                     <div class="row">
                         <div class="col-lg-8">
                             <div class="wr-steps">
@@ -62,10 +63,10 @@
                                         <div class="wiz-lbl hidden-xs"><span>Assign permissions</span></div>
                                     </div>
                                 </div>
-                                <br class="c-both" />
+                                <br class="c-both"/>
                             </div>
-                            <br /><br />
-                            <hr />
+                            <br/><br/>
+                            <hr/>
                             <div id="role-create-error-msg" class="alert alert-danger hidden" role="alert">
                                 <i class="icon fw fw-error"></i><span></span>
                             </div>
@@ -91,7 +92,7 @@
                             <div id="roleNameField" class="form-group wr-input-control">
                                 <!--suppress HtmlFormInputWithoutLabel -->
                                 <input type="text" id="roleName" data-regex="{{roleNameJSRegEx}}"
-                                       data-error-msg="{{roleNameRegExViolationErrorMsg}}" class="form-control" />
+                                       data-error-msg="{{roleNameRegExViolationErrorMsg}}" class="form-control"/>
                                 <span class="roleNameError hidden glyphicon glyphicon-remove form-control-feedback"></span>
                                 <label class="error roleNameEmpty hidden" for="summary">
                                     Role name is required, should be in minimum 3 characters long and not include any
@@ -99,14 +100,14 @@
                                 </label>
                             </div>
                             {{#if canViewUsers}}
-                            <label class="wr-input-label">
-                                User list
-                            </label>
+                                <label class="wr-input-label">
+                                    User list
+                                </label>
 
-                            <div class="wr-input-control">
-                                <!--suppress HtmlFormInputWithoutLabel -->
-                                <select id="users" class="form-control select2" multiple="multiple"></select>
-                            </div>
+                                <div class="wr-input-control">
+                                    <!--suppress HtmlFormInputWithoutLabel -->
+                                    <select id="users" class="form-control select2" multiple="multiple"></select>
+                                </div>
                             {{/if}}
                         </div>
                     </div>
@@ -119,7 +120,7 @@
                     <p class="page-sub-title">Role was added successfully.</p>
                     <br>Please click <b>"Add Another Role"</b>, if you wish to add another role or click
                     <b>"View Role List"</b> to complete the process and go back to the role list.
-                    <hr />
+                    <hr/>
                     <button class="wr-btn" onclick="window.location.href='{{@app.context}}/roles'">
                         View Role List
                     </button>
@@ -136,8 +137,8 @@
             <!-- /content -->
             <div id="app-context" data-app-context="{{@app.context}}" class="hidden"></div>
         </div>
-    </div>
-    <!-- /content/body -->
+        </div>
+        <!-- /content/body -->
     {{else}}
         <h1 class="page-sub-title">
             Permission Denied
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.role.create/create.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.role.create/create.js
index ca91072d12..77ff1d04f5 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.role.create/create.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.role.create/create.js
@@ -18,7 +18,7 @@
 
 /**
  * Returns the dynamic state to be populated by add-user page.
- * 
+ *
  * @param context Object that gets updated with the dynamic state of this page to be presented
  * @returns {*} A displayData object that returns the dynamic state of this page to be presented
  */
@@ -38,6 +38,7 @@ function onRequest(context) {
     if (userModule.isAuthorized("/permission/admin/device-mgt/users/view")) {
         displayData.canViewUsers = true;
     }
+    displayData.isCloud = deviceMgtProps.isCloud;
 
     return displayData;
 }
\ No newline at end of file
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.role.create/public/js/bottomJs.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.role.create/public/js/bottomJs.js
index 2cb8292af7..e070c05835 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.role.create/public/js/bottomJs.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.role.create/public/js/bottomJs.js
@@ -33,6 +33,8 @@ var clearInline = {};
 
 var apiBasePath = "/api/device-mgt/v1.0";
 var domain = $("#domain").val();
+var isCloud = $("#role-create-form").data("cloud");
+
 
 var enableInlineError = function (inputField, errorMsg, errorSign) {
     var fieldIdentifier = "#" + inputField;
@@ -84,18 +86,18 @@ clearInline["role-name"] = function () {
 validateInline["role-name"] = function () {
     var roleNameInput = $("input#roleName");
     var roleName = roleNameInput.val();
-    if (inputIsValid( roleNameInput.data("regex"), roleName) && roleName.indexOf("@") < 0 && roleName.indexOf("/") < 0) {
+    if (inputIsValid(roleNameInput.data("regex"), roleName) && roleName.indexOf("@") < 0 && roleName.indexOf("/") < 0) {
         disableInlineError("roleNameField", "roleNameEmpty", "roleNameError");
     } else {
         enableInlineError("roleNameField", "roleNameEmpty", "roleNameError");
     }
 };
 
-function formatRepo (user) {
+function formatRepo(user) {
     if (user.loading) {
         return user.text
     }
-    if (!user.username){
+    if (!user.username) {
         return;
     }
     var markup = '<div class="clearfix">' +
@@ -103,20 +105,22 @@ function formatRepo (user) {
         '<div class="clearfix">' +
         '<div class="col-sm-4">' + user.username + '</div>';
     if (user.name || user.name != undefined) {
-        markup +=  '<div class="col-sm-8"> ( ' + user.name + ' )</div>';
+        markup += '<div class="col-sm-8"> ( ' + user.name + ' )</div>';
     }
     markup += '</div></div></div>';
     return markup;
 }
 
-function formatRepoSelection (user) {
+function formatRepoSelection(user) {
     return user.username || user.text;
 }
 
 $(document).ready(function () {
+    isCloud = $("#role-create-form").data("cloud");
+
     var appContext = $("#app-context").data("app-context");
     $("#users").select2({
-        multiple:true,
+        multiple: true,
         tags: false,
         ajax: {
             url: appContext + "/api/invoker/execute/",
@@ -140,7 +144,7 @@ $(document).ready(function () {
                     var user = {};
                     user.id = value.username;
                     user.username = value.username;
-                    if(value.firstname && value.lastname) {
+                    if (value.firstname && value.lastname) {
                         user.name = value.firstname + " " + value.lastname;
                     }
                     newData.push(user);
@@ -151,7 +155,9 @@ $(document).ready(function () {
             },
             cache: true
         },
-        escapeMarkup: function (markup) { return markup; }, // let our custom formatter work
+        escapeMarkup: function (markup) {
+            return markup;
+        }, // let our custom formatter work
         minimumInputLength: 1,
         templateResult: formatRepo, // omitted for brevity, see the source of this page
         templateSelection: formatRepoSelection // omitted for brevity, see the source of this page
@@ -163,6 +169,7 @@ $(document).ready(function () {
      * on Add Role page in WSO2 MDM Console.
      */
     $("button#add-role-btn").click(function () {
+
         var domain = $("#domain").val();
         var roleNameInput = $("input#roleName");
         var roleName = roleNameInput.val();
@@ -185,8 +192,12 @@ $(document).ready(function () {
             $(errorMsgWrapper).removeClass("hidden");
         } else {
             var addRoleFormData = {};
-            addRoleFormData.roleName = roleName;
-            if (domain != "PRIMARY"){
+            if (isCloud) {
+                addRoleFormData.roleName = "devicemgt" + roleName;
+            } else {
+                addRoleFormData.roleName = roleName;
+            }
+            if (domain != "PRIMARY") {
                 addRoleFormData.roleName = domain + "/" + roleName;
             }
             if (users == null) {
@@ -220,16 +231,16 @@ $(document).ready(function () {
     });
 
     var roleNameInputElement = "#roleName";
-    $(roleNameInputElement).focus(function() {
+    $(roleNameInputElement).focus(function () {
         clearInline["role-name"]();
     });
 
-    $(roleNameInputElement).blur(function() {
+    $(roleNameInputElement).blur(function () {
         validateInline["role-name"]();
     });
 
     /* When the user store domain value is changed, the users who are assigned to that role should be removed, as
-       user and role can be mapped only if both are in same user store
+     user and role can be mapped only if both are in same user store
      */
     $("#domain").change(function () {
         $("#users").select2("val", "");
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js
index 98749decd7..6899f98fb2 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js
@@ -37,6 +37,7 @@ var modalPopupContainer = modalPopup + " .modal-content";
 var modalPopupContent = modalPopup + " .modal-content";
 var body = "body";
 var isInit = true;
+var isCloud = false;
 
 
 /**
@@ -72,7 +73,7 @@ function showPopup() {
 function hidePopup() {
     $(modalPopupContent).html('');
     $(modalPopup).modal('hide');
-    $('body').removeClass('modal-open').css('padding-right','0px');
+    $('body').removeClass('modal-open').css('padding-right', '0px');
     $('.modal-backdrop').remove();
 }
 
@@ -86,11 +87,12 @@ function InitiateViewOption() {
     // $(location).attr('href', $(this).data("url"));
 }
 
-function htmlspecialchars(text){
+function htmlspecialchars(text) {
     return jQuery('<div/>').text(text).html();
 }
 
 function loadRoles() {
+    isCloud = $("#role-table").data("cloud");
     var loadingContent = $("#loading-content");
     loadingContent.show();
 
@@ -98,21 +100,40 @@ function loadRoles() {
         data = JSON.parse(data);
 
         var objects = [];
-
+        var count = 0;
         $(data.roles).each(function (index) {
-            objects.push(
-                {
-                    name: htmlspecialchars(data.roles[index]),
-                    DT_RowId: "role-" + htmlspecialchars(data.roles[index])
-                }
-            )
+            if (isCloud && data.roles[index].startsWith("devicemgt")) {
+                count++;
+                objects.push(
+                    {
+                        name: htmlspecialchars(data.roles[index]),
+                        DT_RowId: "role-" + htmlspecialchars(data.roles[index])
+                    }
+                )
+            } else if (!isCloud) {
+                objects.push(
+                    {
+                        name: htmlspecialchars(data.roles[index]),
+                        DT_RowId: "role-" + htmlspecialchars(data.roles[index])
+                    }
+                )
+            }
         });
 
-        var json = {
-            "recordsTotal": data.count,
-            "recordsFiltered": data.count,
-            "data": objects
-        };
+        var json = {};
+        if (isCloud) {
+            json = {
+                "recordsTotal": count,
+                "recordsFiltered": count,
+                "data": objects
+            };
+        } else {
+            json = {
+                "recordsTotal": data.count,
+                "recordsFiltered": data.count,
+                "data": objects
+            };
+        }
 
         return JSON.stringify(json);
     };
@@ -143,13 +164,13 @@ function loadRoles() {
             data: null,
             render: function (data, type, row, meta) {
                 var isCloud = false;
-                if ($('#is-cloud').length > 0){
+                if ($('#is-cloud').length > 0) {
                     isCloud = true;
                 }
 
-                var innerhtml =  '';
+                var innerhtml = '';
 
-                    var editLink = '<a onclick="javascript:loadRoleBasedActionURL(\'edit\', \'' + data.name + '\')" ' +
+                var editLink = '<a onclick="javascript:loadRoleBasedActionURL(\'edit\', \'' + data.name + '\')" ' +
                     'data-role="' + data.name + '" ' +
                     'data-click-event="edit-form" ' +
                     'class="btn padding-reduce-on-grid-view edit-role-link">' +
@@ -179,7 +200,7 @@ function loadRoles() {
                     '<span class="hidden-xs hidden-on-grid-view">Edit Permission</span>' +
                     '</a>';
 
-                    var removeLink = '<a data-role="' + data.name + '" ' +
+                var removeLink = '<a data-role="' + data.name + '" ' +
                     'data-click-event="remove-form" ' +
                     'class="btn padding-reduce-on-grid-view remove-role-link">' +
                     '<span class="fw-stack">' +
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/roles.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/roles.hbs
index 962a7f3cea..47e8181218 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/roles.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/roles.hbs
@@ -36,39 +36,40 @@
 
 {{#zone "navbarActions"}}
     {{#unless isCloud}}
-    <li>
-        <!--suppress HtmlUnknownTarget -->
-        <a href="{{@app.context}}/role/add" class="cu-btn">
+        <li>
+            <!--suppress HtmlUnknownTarget -->
+            <a href="{{@app.context}}/role/add" class="cu-btn">
             <span class="icon fw-stack">
                 <i class="fw fw-add fw-stack-1x"></i>
                 <i class="fw fw-circle-outline fw-stack-2x"></i>
             </span>
-            Add Role
-        </a>
-    </li>
+                Add Role
+            </a>
+        </li>
     {{/unless}}
 {{/zone}}
 
 {{#zone "content"}}
     <div id="loading-content" class="col-centered">
         {{#unless isCloud}}
-        {{#if removePermitted}}
-            <input type="hidden" id="can-remove" value="true" />
-        {{/if}}
-        {{#if editPermitted}}
-            <input type="hidden" id="can-edit" value="true" />
-        {{/if}}
+            {{#if removePermitted}}
+                <input type="hidden" id="can-remove" value="true"/>
+            {{/if}}
+            {{#if editPermitted}}
+                <input type="hidden" id="can-edit" value="true"/>
+            {{/if}}
         {{/unless}}
         {{#if isCloud}}
-            <input type="hidden" id="is-cloud" value="true" />
+            <input type="hidden" id="is-cloud" value="true"/>
         {{/if}}
         <i class="fw fw-settings fw-spin fw-2x"></i>
         Loading roles . . .
         <br>
     </div>
 
-    <div id="role-table" data-role={{adminRole}}>
-        <table class="table table-striped table-hover list-table display responsive nowrap data-table grid-view" id="role-grid">
+    <div id="role-table" data-cloud={{isCloud}} data-role={{adminRole}}>
+        <table class="table table-striped table-hover list-table display responsive nowrap data-table grid-view"
+               id="role-grid">
             <thead>
             <tr class="sort-row">
                 <th>By Role Name</th>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.cloud.user-menu/public/js/user-menu.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.cloud.user-menu/public/js/user-menu.js
index fe5ac86b97..edd143481b 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.cloud.user-menu/public/js/user-menu.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.cloud.user-menu/public/js/user-menu.js
@@ -18,11 +18,11 @@
 $(document).ready(function () {
     $('#cloud-menu-popover i.fw-tiles').popover({
         html: true,
-        trigger:'click',
-        title: function() {
+        trigger: 'click',
+        title: function () {
             return $("#popover-head").html();
         },
-        content: function() {
+        content: function () {
             return $("#popover-content").html();
         }
     });
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.cloud.user-menu/user-menu.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.cloud.user-menu/user-menu.hbs
index 69562888a0..c9016ccf3e 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.cloud.user-menu/user-menu.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.cloud.user-menu/user-menu.hbs
@@ -22,7 +22,7 @@
                 {{#if this.dropDownVisible}}
                class="dropdown" data-toggle="dropdown"
                 {{/if}}
-               title = "
+               title="
                 {{#if this.isDomain }}
                    {{@user.domain}}
                {{else}}