diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs
index b8af094ac..4b2a55318 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs
@@ -168,7 +168,7 @@
                                    class="form-control operationDataKeys" data-key="passcodePolicyAllowSimple"
                                    checked="checked"/>
                             <span class="helper"
-                                  title="Permit the use of repeating, ascending and descending character sequences">
+                                  title="Permits repeating, ascending and descending character sequences">
                                 Allow simple value
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
@@ -180,7 +180,7 @@
                             <input id="passcode-policy-require-alphanumeric" type="checkbox"
                                    class="form-control operationDataKeys" data-key="passcodePolicyRequireAlphanumeric"
                                    checked="checked"/>
-                            <span class="helper" title="Require passcode to contain both letters and numbers">
+                            <span class="helper" title="Mandates to contain both letters and numbers">
                                 Require alphanumeric value
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
@@ -242,7 +242,7 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            ( Should be in between 1-to-730 days or none )
+                            ( Should be in between 1-to-730 days or 0 for none )
                         </label>
                         <input id="passcode-policy-max-passcode-age-in-days" type="text"
                                class="form-control operationDataKeys" data-key="passcodePolicyMaxPasscodeAgeInDays"
@@ -256,7 +256,7 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            ( Should be in between 1-to-50 passcodes or none )
+                            ( Should be in between 1-to-50 passcodes or 0 for none )
                         </label>
                         <input id="passcode-policy-passcode-history" type="text" class="form-control operationDataKeys"
                                data-key="passcodePolicyPasscodeHistory" maxlength="2">
@@ -266,7 +266,7 @@
                         <label class="wr-input-label" for="passcodePolicyMaxFailedAttempts">
                             Maximum number of failed attempts
                             <span class="helper"
-                                  title="The maximum number of failed password entry attempts. If the correct password is not entered within the defined number of attempts, the data on the device will be erased">
+                                  title="The maximum number of incorrect password entries allowed. If the correct password is not entered within the allowed number of attempts, the data on the device will be erased.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-view/public/templates/android-policy-view.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-view/public/templates/android-policy-view.hbs
index e82c6775f..9440061d9 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-view/public/templates/android-policy-view.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-view/public/templates/android-policy-view.hbs
@@ -149,7 +149,7 @@
                                    class="form-control operationDataKeys" data-key="passcodePolicyAllowSimple"
                                    checked="checked" disabled/>
                             <span class="helper"
-                                  title="Permit the use of repeating, ascending and descending character sequences">
+                                  title="Permits repeating, ascending and descending character sequences">
                                 Allow simple value
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
@@ -161,7 +161,7 @@
                             <input id="passcode-policy-require-alphanumeric" type="checkbox"
                                    class="form-control operationDataKeys" data-key="passcodePolicyRequireAlphanumeric"
                                    checked="checked" disabled/>
-                            <span class="helper" title="Require passcode to contain both letters and numbers">
+                            <span class="helper" title="Mandates to contain both letters and numbers">
                                 Require alphanumeric value
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
@@ -223,7 +223,7 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            ( Should be in between 1-to-730 days or none )
+                            ( Should be in between 1-to-730 days or 0 for none )
                         </label>
                         <input id="passcode-policy-max-passcode-age-in-days" type="text"
                                class="form-control operationDataKeys" data-key="passcodePolicyMaxPasscodeAgeInDays"
@@ -237,7 +237,7 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            ( Should be in between 1-to-50 passcodes or none )
+                            ( Should be in between 1-to-50 passcodes or 0 for none )
                         </label>
                         <input id="passcode-policy-passcode-history" type="text" class="form-control operationDataKeys"
                                data-key="passcodePolicyPasscodeHistory" maxlength="2"
@@ -248,7 +248,7 @@
                         <label class="wr-input-label" for="passcodePolicyMaxFailedAttempts">
                             Maximum number of failed attempts
                             <span class="helper"
-                                  title="The maximum number of failed password entry attempts. If the correct password is not entered within the defined number of attempts, the data on the device will be erased">
+                                  title="The maximum number of incorrect password entries allowed. If the correct password is not entered within the allowed number of attempts, the data on the device will be erased.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/public/templates/android-policy-operations.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/public/templates/android-policy-operations.hbs
index 6334c19b2..a6cb40a00 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/public/templates/android-policy-operations.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/public/templates/android-policy-operations.hbs
@@ -173,7 +173,7 @@
                                    class="form-control operationDataKeys" data-key="passcodePolicyAllowSimple"
                                    checked="checked"/>
                             <span class="helper"
-                                  title="Permit the use of repeating, ascending and descending character sequences">
+                                  title="Permits repeating, ascending and descending character sequences">
                                 Allow simple value
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
@@ -185,7 +185,7 @@
                             <input id="passcode-policy-require-alphanumeric" type="checkbox"
                                    class="form-control operationDataKeys" data-key="passcodePolicyRequireAlphanumeric"
                                    checked="checked"/>
-                            <span class="helper" title="Require passcode to contain both letters and numbers">
+                            <span class="helper" title="Mandates to contain both letters and numbers">
                                 Require alphanumeric value
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
@@ -247,7 +247,7 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            ( Should be in between 1-to-730 days or none )
+                            ( Should be in between 1-to-730 days or 0 for none )
                         </label>
                         <input id="passcode-policy-max-passcode-age-in-days" type="text"
                                class="form-control operationDataKeys" data-key="passcodePolicyMaxPasscodeAgeInDays"
@@ -261,7 +261,7 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            ( Should be in between 1-to-50 passcodes or none )
+                            ( Should be in between 1-to-50 passcodes or 0 for none )
                         </label>
                         <input id="passcode-policy-passcode-history" type="text" class="form-control operationDataKeys"
                                data-key="passcodePolicyPasscodeHistory" maxlength="2">
@@ -271,7 +271,7 @@
                         <label class="wr-input-label" for="passcodePolicyMaxFailedAttempts">
                             Maximum number of failed attempts
                             <span class="helper"
-                                  title="The maximum number of failed password entry attempts. If the correct password is not entered within the defined number of attempts, the data on the device will be erased">
+                                  title="The maximum number of incorrect password entries allowed. If the correct password is not entered within the allowed number of attempts, the data on the device will be erased.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.policy-edit/public/templates/windows-policy-edit.hbs b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.policy-edit/public/templates/windows-policy-edit.hbs
index 1ee9b63c5..5b97a6692 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.policy-edit/public/templates/windows-policy-edit.hbs
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.policy-edit/public/templates/windows-policy-edit.hbs
@@ -66,7 +66,7 @@
                                    class="form-control operationDataKeys" data-key="passcodePolicyAllowSimple"
                                    checked="checked"/>
                             <span class="helper"
-                                  title="Permit the use of repeating, ascending and descending character sequences">
+                                  title="Permits repeating, ascending and descending character sequences">
                                    Allow simple value
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
@@ -78,7 +78,7 @@
                             <input id="passcode-policy-require-alphanumeric" type="checkbox"
                                    class="form-control operationDataKeys" data-key="passcodePolicyRequireAlphanumeric"
                                    checked="checked"/>
-                            <span class="helper" title="Require passcode to contain both letters and numbers">
+                            <span class="helper" title="Mandates to contain both letters and numbers">
                                    Require alphanumeric value
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
@@ -143,7 +143,7 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            ( Should be in between 1-to-730 days or none )
+                            ( Should be in between 1-to-730 days or 0 for none )
                         </label>
                         <input id="passcode-policy-max-passcode-age-in-days" type="text"
                                class="form-control operationDataKeys" data-key="passcodePolicyMaxPasscodeAgeInDays"
@@ -157,7 +157,7 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            ( Should be in between 1-to-50 passcodes or none )
+                            ( Should be in between 1-to-50 passcodes or 0 for none )
                         </label>
                         <input id="passcode-policy-passcode-history" type="text" class="form-control operationDataKeys"
                                data-key="passcodePolicyPasscodeHistory" maxlength="2"
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.policy-view/public/templates/windows-policy-view.hbs b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.policy-view/public/templates/windows-policy-view.hbs
index 4410d14e2..cbf6f558e 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.policy-view/public/templates/windows-policy-view.hbs
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.policy-view/public/templates/windows-policy-view.hbs
@@ -66,7 +66,7 @@
                                    class="form-control operationDataKeys" data-key="passcodePolicyAllowSimple"
                                    checked="checked" disabled/>
                             <span class="helper"
-                                  title="Permit the use of repeating, ascending and descending character sequences">
+                                  title="Permits repeating, ascending and descending character sequences">
                                    Allow simple value
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
@@ -78,7 +78,7 @@
                             <input id="passcode-policy-require-alphanumeric" type="checkbox"
                                    class="form-control operationDataKeys" data-key="passcodePolicyRequireAlphanumeric"
                                    checked="checked" disabled/>
-                            <span class="helper" title="Require passcode to contain both letters and numbers">
+                            <span class="helper" title="Mandates to contain both letters and numbers">
                                    Require alphanumeric value
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
@@ -143,7 +143,7 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            ( Should be in between 1-to-730 days or none )
+                            ( Should be in between 1-to-730 days or 0 for none )
                         </label>
                         <input id="passcode-policy-max-passcode-age-in-days" type="text"
                                class="form-control operationDataKeys" data-key="passcodePolicyMaxPasscodeAgeInDays"
@@ -157,7 +157,7 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            ( Should be in between 1-to-50 passcodes or none )
+                            ( Should be in between 1-to-50 passcodes or 0 for none )
                         </label>
                         <input id="passcode-policy-passcode-history" type="text" class="form-control operationDataKeys"
                                data-key="passcodePolicyPasscodeHistory" maxlength="2"
@@ -168,7 +168,7 @@
                         <label class="wr-input-label" for="passcodePolicyMaxFailedAttempts">
                             Maximum number of failed attempts
                             <span class="helper"
-                                  title="The maximum number of failed password entry attempts. If the correct password is not entered within the defined number of attempts, the data on the device will be erased">
+                                  title="The maximum number of incorrect password entries allowed. If the correct password is not entered within the allowed number of attempts, the data on the device will be erased.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.policy-wizard/public/templates/windows-policy-operations.hbs b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.policy-wizard/public/templates/windows-policy-operations.hbs
index 1ee9b63c5..5b97a6692 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.policy-wizard/public/templates/windows-policy-operations.hbs
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.policy-wizard/public/templates/windows-policy-operations.hbs
@@ -66,7 +66,7 @@
                                    class="form-control operationDataKeys" data-key="passcodePolicyAllowSimple"
                                    checked="checked"/>
                             <span class="helper"
-                                  title="Permit the use of repeating, ascending and descending character sequences">
+                                  title="Permits repeating, ascending and descending character sequences">
                                    Allow simple value
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
@@ -78,7 +78,7 @@
                             <input id="passcode-policy-require-alphanumeric" type="checkbox"
                                    class="form-control operationDataKeys" data-key="passcodePolicyRequireAlphanumeric"
                                    checked="checked"/>
-                            <span class="helper" title="Require passcode to contain both letters and numbers">
+                            <span class="helper" title="Mandates to contain both letters and numbers">
                                    Require alphanumeric value
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
@@ -143,7 +143,7 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            ( Should be in between 1-to-730 days or none )
+                            ( Should be in between 1-to-730 days or 0 for none )
                         </label>
                         <input id="passcode-policy-max-passcode-age-in-days" type="text"
                                class="form-control operationDataKeys" data-key="passcodePolicyMaxPasscodeAgeInDays"
@@ -157,7 +157,7 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            ( Should be in between 1-to-50 passcodes or none )
+                            ( Should be in between 1-to-50 passcodes or 0 for none )
                         </label>
                         <input id="passcode-policy-passcode-history" type="text" class="form-control operationDataKeys"
                                data-key="passcodePolicyPasscodeHistory" maxlength="2"