diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/create.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/create.hbs
index 94581d56fc..9e6ee54a71 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/create.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/create.hbs
@@ -41,7 +41,9 @@
 
             <hr/>
             <div class="form-login-box" >
-                <label class="wr-input-label">Group Name</label>
+                <label class="wr-input-label" title="{{groupNameHelpMsg}}">Group Name
+                    <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                </label>
 
                 <div class="form-group wr-input-control">
                     <input type="text right" id="name" placeholder="Group Name" data-regex="{{groupNameJSRegEx}}"
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js
index 716d6f6917..4c8cf8ec66 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js
@@ -232,6 +232,9 @@ function loadGroups() {
         $.each($('td', row), function (colIndex) {
             switch (colIndex) {
                 case 1:
+                    //TODO : The following line encodes html entities. 
+                    //Should check for a better solution since it only changes the presentation layer
+                    $(this).text($("<textarea></textarea>").html(this.innerText).text())
                     $(this).attr('data-grid-label', "Name");
                     $(this).attr('data-search', data.name);
                     $(this).attr('data-display', data.name);