diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.register/public/js/validate-register.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.register/public/js/validate-register.js
index 82b0068f7c..2603d165cb 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.register/public/js/validate-register.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.register/public/js/validate-register.js
@@ -92,7 +92,7 @@ $(document).ready(function(){
             $(errorMsg).text("Password is a required field. It cannot be empty.");
             $(errorMsgWrapper).removeClass("hidden");
         } else if (password.length < 6) {
-            $(errorMsg).text("Password is a required field. It cannot be empty.");
+            $(errorMsg).text("Password should contain a minimum of 6 characters.");
             $(errorMsgWrapper).removeClass("hidden");
         } else if (password != passwordConfirmation) {
             $(errorMsg).text("Please enter the same password for confirmation.");
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 8d96406314..da9e93aeca 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
@@ -50,7 +50,7 @@
                     {{/if}}
                     <div class="wr-input-control wr-btn-grp">
                         <button class="wr-btn btn-download-agent">
-                            Login
+                            Log in
                         </button>
                         <div id="register-link-wrapper" style="float: right; padding-top: 10px;">
                             <a href="{{@app.context}}/register" class="pull-right create-account">Create an account</a>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/edit.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/edit.hbs
index 2badf02176..4abf440dc3 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/edit.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/edit.hbs
@@ -67,7 +67,7 @@
                                 </div>
                                 <div class="clearfix">
                                     <label class="wr-input-label">
-                                        Set a name * to your policy<br>
+                                        Set a name to your policy *<br>
                                         ( should be 1-to-30 characters long )
                                     </label>
                                     <div id="policy-name-field" class="form-group wr-input-control">