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 2256807f3..58f1b9fcb 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
@@ -474,38 +474,6 @@
                         </label>
                     </div>
                     <br>
-                    <div class="wr-input-control">
-                        <label class="wr-input-control checkbox">
-                            <input id="ensure-verifying-apps-enabled" type="checkbox" class="operationDataKeys"
-                                   data-key="ensureVerifyApps"/>
-                            <span class="helper" title="Ensure app verification.">
-                                Ensure verifying apps
-                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
-                            </span>
-                        </label>
-                    </div>
-                    <br>
-                    <div class="wr-input-control">
-                        <label class="wr-input-control checkbox">
-                            <input id="enable-auto-timing-enabled" type="checkbox" class="operationDataKeys"
-                                   data-key="enableAutoTime"/>
-                            <span class="helper" title="Enables the auto time feature that is in the device's Settings &gt; Date &amp; Time.">
-                                Enable auto timing
-                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
-                            </span>
-                        </label>
-                    </div>
-                    <br>
-                    <div class="wr-input-control">
-                        <label class="wr-input-control checkbox">
-                            <input id="disable-screen-capture-enabled" type="checkbox" class="operationDataKeys"
-                                   data-key="disableScreenCapture"/>
-                            <span class="helper" title="Screen capturing would be disabled.">
-                                Disable screen capture
-                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
-                            </span>
-                        </label>
-                    </div>
                     <div>
                         <ul class="message message-info">
                             <i class="icon fw fw-info"></i>
@@ -524,6 +492,38 @@
                         </label>
                     </div>
                     <br>
+                        <div class="wr-input-control">
+                            <label class="wr-input-control checkbox">
+                                <input id="ensure-verifying-apps-enabled" type="checkbox" class="operationDataKeys"
+                                       data-key="ensureVerifyApps"/>
+                                <span class="helper" title="Ensure app verification.">
+                                Ensure verifying apps
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                            </label>
+                        </div>
+                        <br>
+                        <div class="wr-input-control">
+                            <label class="wr-input-control checkbox">
+                                <input id="enable-auto-timing-enabled" type="checkbox" class="operationDataKeys"
+                                       data-key="enableAutoTime"/>
+                                <span class="helper" title="Enables the auto time feature that is in the device's Settings &gt; Date &amp; Time.">
+                                Enable auto timing
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                            </label>
+                        </div>
+                        <br>
+                        <div class="wr-input-control">
+                            <label class="wr-input-control checkbox">
+                                <input id="disable-screen-capture-enabled" type="checkbox" class="operationDataKeys"
+                                       data-key="disableScreenCapture"/>
+                                <span class="helper" title="Screen capturing would be disabled.">
+                                Disable screen capture
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                            </label>
+                        </div>
                     <div class="wr-input-control">
                         <label class="wr-input-control checkbox">
                             <input id="volume-adjust-enabled" type="checkbox" class="operationDataKeys"
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 c78fd533d..5ee90b3cc 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
@@ -485,57 +485,15 @@
                             </label>
                         </div>
                         <br>
-                        <div class="wr-input-control worker-profile-or-owner">
-                            <label class="wr-input-control checkbox">
-                                <input id="ensure-verifying-apps-enabled" type="checkbox" class="operationDataKeys"
-                                       data-key="ensureVerifyApps"/>
-                                <span class="helper" title="Ensure app verification.">
-                                Ensure verifying apps
-                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
-                            </span>
-                            </label>
-                        </div>
-                        <br>
-                        <div class="wr-input-control worker-profile-or-owner">
-                            <label class="wr-input-control checkbox">
-                                <input id="enable-auto-timing-enabled" type="checkbox" class="operationDataKeys"
-                                       data-key="enableAutoTime"/>
-                                <span class="helper" title="Enables the auto time feature that is in the device's Settings &gt; Date &amp; Time.">
-                                Enable auto timing
-                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
-                            </span>
-                            </label>
-                        </div>
-                        <br>
-                        <div class="wr-input-control worker-profile-or-owner">
-                            <label class="wr-input-control checkbox">
-                                <input id="disable-screen-capture-enabled" type="checkbox" class="operationDataKeys"
-                                       data-key="disableScreenCapture"/>
-                                <span class="helper" title="Screen capturing would be disabled.">
-                                Disable screen capture
-                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
-                            </span>
-                            </label>
-                        </div>
                         <div class="device-owner">
                             <ul class="message message-info device-owner">
                                 <i class="icon fw fw-info"></i>
                                 <a id="policy-listing-status-msg"> Below Restrictions are valid only when the Agent is
                                     the
                                     <b>device owner</b>.</a>
-                                {{#unless isdeviceownerenabled}}
-                                    <p><i>Please change the configuration <b>'isDeviceOwnerEnabled'</b> to
-                                        <b>'true'</b> if you have enabled device owner for the agent.</i></p>
-                                {{/unless}}
                             </ul>
                         </div>
                         <br/>
-                        <div
-                            {{#unless isdeviceownerenabled}}
-                            class="testing" title="Please change the configuration 'isDeviceOwnerEnabled' to
-                         'true' if you have enabled device owner for the agent."
-                            {{/unless}}
-                        >
                             <div class="wr-input-control device-owner">
                                 <label class="wr-input-control checkbox">
                                     <input id="disallow-SMS-enabled" type="checkbox" class="operationDataKeys"
@@ -547,6 +505,38 @@
                                 </label>
                             </div>
                             <br>
+                            <div class="wr-input-control device-owner">
+                                <label class="wr-input-control checkbox">
+                                    <input id="ensure-verifying-apps-enabled" type="checkbox" class="operationDataKeys"
+                                           data-key="ensureVerifyApps"/>
+                                    <span class="helper" title="Ensure app verification.">
+                                Ensure verifying apps
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                                </label>
+                            </div>
+                            <br>
+                            <div class="wr-input-control device-owner">
+                                <label class="wr-input-control checkbox">
+                                    <input id="enable-auto-timing-enabled" type="checkbox" class="operationDataKeys"
+                                           data-key="enableAutoTime"/>
+                                    <span class="helper" title="Enables the auto time feature that is in the device's Settings &gt; Date &amp; Time.">
+                                Enable auto timing
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                                </label>
+                            </div>
+                            <br>
+                            <div class="wr-input-control device-owner">
+                                <label class="wr-input-control checkbox">
+                                    <input id="disable-screen-capture-enabled" type="checkbox" class="operationDataKeys"
+                                           data-key="disableScreenCapture"/>
+                                    <span class="helper" title="Screen capturing would be disabled.">
+                                Disable screen capture
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                                </label>
+                            </div>
                             <div class="wr-input-control device-owner">
                                 <label class="wr-input-control checkbox">
                                     <input id="volume-adjust-enabled" type="checkbox" class="operationDataKeys"