diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.sign-in.consent-do/consent-do.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.sign-in.consent-do/consent-do.hbs
index a14d591384..56f05e6956 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.sign-in.consent-do/consent-do.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.sign-in.consent-do/consent-do.hbs
@@ -31,12 +31,14 @@
             <div class="panel-body">
                 <form id="consentForm" method="POST" action="/commonauth">
                     <p>By selecting following attributes I agree to share them with the above service provider.</p>
+                    {{#unless singleMandatoryClaim}}
                     <div class="wr-input-control">
                         <label class="wr-input-control checkbox">
                             <input type="checkbox" name="consent_select_all" id="consent_select_all"/>
                             <span class="helper" title="Select All">Select All</span>
                         </label>
                     </div>
+                    {{/unless}}
                     <div class="wr-input-control">
                     {{#each mandatoryClaims}}
                         <label class="wr-input-control checkbox">
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.sign-in.consent-do/consent-do.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.sign-in.consent-do/consent-do.js
index e15908617e..346b81df46 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.sign-in.consent-do/consent-do.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.sign-in.consent-do/consent-do.js
@@ -4,11 +4,13 @@ function onRequest(context) {
     viewModel.appName = Encode.forHtml(request.getParameter("sp"));
     var mandatoryClaims = [];
     var requestedClaims = [];
+    var singleMandatoryClaim = false;
 
     var mandatoryClaimsList, requestedClaimsList;
     var i, j, partOne, partTwo;
     if (request.getParameter("mandatoryClaims")) {
         mandatoryClaimsList = request.getParameter("mandatoryClaims").split(",");
+        singleMandatoryClaim = (mandatoryClaimsList.length === 1);
         for (j = 0; j < mandatoryClaimsList.length; j++) {
             var mandatoryClaimsStr = mandatoryClaimsList[j];
             i = mandatoryClaimsStr.indexOf('_');
@@ -33,6 +35,7 @@ function onRequest(context) {
     }
     viewModel.mandatoryClaims = mandatoryClaims;
     viewModel.requestedClaims = requestedClaims;
+    viewModel.singleMandatoryClaim = singleMandatoryClaim;
     viewModel.sessionDataKey = Encode.forHtmlAttribute(request.getParameter("sessionDataKey"));
     return viewModel;
 }
\ No newline at end of file