diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.register/register.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.register/register.hbs
index bb9106fd53e..b9977f909bb 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.register/register.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.register/register.hbs
@@ -59,19 +59,19 @@
                        class="form-control" placeholder="Confirm Password"/>
             </div>
 
+            <div class="alert alert-warning" style="border-radius:5px"><p class="doc-link">
+                This site uses cookies. By logging in to the site, you are agreeing on the usage of cookies. For more information, refer <a href="{{@unit.publicUri}}/privacy-policies/cookie-policy" style="color:#ffffff;"
+                                                                                                                                            target="_blank"><u>cookie policy</u></a> and
+                <a href="{{@unit.publicUri}}/privacy-policies/privacy-policy" style="color:#ffffff;"
+                   target="_blank"><u>privacy policy</u></a></p>
+            </div>
+
             <div class="wr-input-control">
                 <button class="wr-btn" id="add-user-btn">Register</button>
                 <button class="wr-btn" onclick="document.location.href='{{@app.context}}/login';">
                     Cancel
                 </button>
             </div>
-
-            <div>
-                Attention! <a href="{{@unit.publicUri}}/privacy-policies/privacy-policy" class="create-account"
-                              target="_blank">Privacy policy</a> and
-                <a href="{{@unit.publicUri}}/privacy-policies/cookie-policy" class="create-account" target="_blank">Ccokile
-                    policy</a> updated.
-            </div>
         </div>
 
     </div>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.sign-in/sign-in.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.sign-in/sign-in.hbs
index 55e82cc85b2..bd000a752df 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.sign-in/sign-in.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.sign-in/sign-in.hbs
@@ -48,6 +48,14 @@
                     {{#if referer}}
                         <input type="hidden" name="referer" value="{{referer}}"/>
                     {{/if}}
+
+                    <div class="alert alert-warning" style="border-radius:5px"><p class="doc-link">
+                        This site uses cookies. By logging in to the site, you are agreeing on the usage of cookies. For more information, refer <a href="{{@unit.publicUri}}/privacy-policies/cookie-policy" style="color:#ffffff;"
+                                                                                                                                                    target="_blank"><u>cookie policy</u></a> and
+                        <a href="{{@unit.publicUri}}/privacy-policies/privacy-policy" style="color:#ffffff;"
+                           target="_blank"><u>privacy policy</u></a></p>
+                    </div>
+
                     <div class="wr-input-control wr-btn-grp">
                         <button class="wr-btn btn-download-agent">
                             Log in
@@ -56,12 +64,6 @@
                             <a href="{{@app.context}}/register" class="pull-right create-account">Create an account</a>
                         </div>
                     </div>
-                    <div>
-                        Attention! <a href="{{@unit.publicUri}}/privacy-policies/privacy-policy" class="create-account"
-                                      target="_blank">Privacy policy</a> and
-                        <a href="{{@unit.publicUri}}/privacy-policies/cookie-policy" class="create-account"
-                           target="_blank">Ccokile policy</a> updated.
-                    </div>
                 </form>
             </div>
         </div>