diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.user.listing/public/templates/listing.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.user.listing/public/templates/listing.hbs
index 49ffefc351d..6414e6de93f 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.user.listing/public/templates/listing.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.user.listing/public/templates/listing.hbs
@@ -33,7 +33,7 @@
             {{#unequal adminUser username }}
                 {{#if canRemove}}
                     <a href="#" data-username="{{username}}" data-userid="{{userid}}"
-                       data-click-event="remove-form" onclick="            {{username}}    {{userid}}  "
+                       data-click-event="remove-form" onclick="removeUser('{{username}}', '{{userid}}')"
                        class="btn padding-reduce-on-grid-view remove-user-link">
                                 <span class="fw-stack">
                                     <i class="fw fw-ring fw-stack-2x"></i>
@@ -47,7 +47,7 @@
             {{#unequal adminUser username }}
                 {{#if canResetPassword}}
                     <a href="#" data-username="{{username}}" data-userid="{{userid}}"
-                       data-click-event="edit-form" onclick="               {{username}}  "
+                       data-click-event="edit-form" onclick="resetPassword('{{username}}')"
                        class="btn padding-reduce-on-grid-view remove-user-link">
                                 <span class="fw-stack">
                                        <i class="fw fw-ring fw-stack-2x"></i>