diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/js/policy-create.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/js/policy-create.js
index bcef26ec8..9c7079260 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/js/policy-create.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/js/policy-create.js
@@ -1843,28 +1843,23 @@ validateStep["policy-profile"] = function () {
 
                 if (continueToCheckNextInputs) {
                     var calendarAccountPort = $("input#calendar-account-port").val();
-                    if (!calendarAccountPort) {
-                        validationStatus = {
-                            "error": true,
-                            "subErrorMsg": "Account Port is empty. You cannot proceed.",
-                            "erroneousFeature": operation
-                        };
-                        continueToCheckNextInputs = false;
-                    } else if (!$.isNumeric(calendarAccountPort)) {
-                        validationStatus = {
-                            "error": true,
-                            "subErrorMsg": "Account Port requires a number input.",
-                            "erroneousFeature": operation
-                        };
-                        continueToCheckNextInputs = false;
-                    } else if (!inputIsValidAgainstRange(calendarAccountPort, 0, 65535)) {
-                        validationStatus = {
-                            "error": true,
-                            "subErrorMsg": "Account Port is not within the range " +
+                    if (calendarAccountPort) {
+                        if (!$.isNumeric(calendarAccountPort)) {
+                            validationStatus = {
+                                "error": true,
+                                "subErrorMsg": "Account Port requires a number input.",
+                                "erroneousFeature": operation
+                            };
+                            continueToCheckNextInputs = false;
+                        } else if (!inputIsValidAgainstRange(calendarAccountPort, 0, 65535)) {
+                            validationStatus = {
+                                "error": true,
+                                "subErrorMsg": "Account Port is not within the range " +
                                 "of valid port numbers.",
-                            "erroneousFeature": operation
-                        };
-                        continueToCheckNextInputs = false;
+                                "erroneousFeature": operation
+                            };
+                            continueToCheckNextInputs = false;
+                        }
                     }
                 }
 
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-ios.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-ios.hbs
index 761bd4847..162582c6f 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-ios.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-ios.hbs
@@ -3236,7 +3236,7 @@
                         </label>
                         <input id="calendar-account-port" type="text" class="form-control operationDataKeys"
                                data-key="calendarAccountPort" maxlength="5" data-default=""
-                               placeholder="[ Required field which requires Number Input ]"/>
+                               placeholder="[ Optional field which requires Number Input ]"/>
                     </div>
 
                     <div class="wr-input-control">
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/js/edit.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/js/edit.js
index 3e2728ca1..49841cefc 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/js/edit.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/js/edit.js
@@ -1603,28 +1603,23 @@ validateStep["policy-profile"] = function () {
 
                 if (continueToCheckNextInputs) {
                     var calendarAccountPort = $("input#calendar-account-port").val();
-                    if (!calendarAccountPort) {
-                        validationStatus = {
-                            "error": true,
-                            "subErrorMsg": "Account Port is empty. You cannot proceed.",
-                            "erroneousFeature": operation
-                        };
-                        continueToCheckNextInputs = false;
-                    } else if (!$.isNumeric(calendarAccountPort)) {
-                        validationStatus = {
-                            "error": true,
-                            "subErrorMsg": "Account Port requires a number input.",
-                            "erroneousFeature": operation
-                        };
-                        continueToCheckNextInputs = false;
-                    } else if (!inputIsValidAgainstRange(calendarAccountPort, 0, 65535)) {
-                        validationStatus = {
-                            "error": true,
-                            "subErrorMsg": "Account Port is not within the range " +
-                                           "of valid port numbers.",
-                            "erroneousFeature": operation
-                        };
-                        continueToCheckNextInputs = false;
+                    if (calendarAccountPort) {
+                        if (!$.isNumeric(calendarAccountPort)) {
+                            validationStatus = {
+                                "error": true,
+                                "subErrorMsg": "Account Port requires a number input.",
+                                "erroneousFeature": operation
+                            };
+                            continueToCheckNextInputs = false;
+                        } else if (!inputIsValidAgainstRange(calendarAccountPort, 0, 65535)) {
+                            validationStatus = {
+                                "error": true,
+                                "subErrorMsg": "Account Port is not within the range " +
+                                "of valid port numbers.",
+                                "erroneousFeature": operation
+                            };
+                            continueToCheckNextInputs = false;
+                        }
                     }
                 }
 
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-ios-edit.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-ios-edit.hbs
index 3359b8c21..657ad4893 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-ios-edit.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-ios-edit.hbs
@@ -3339,7 +3339,7 @@
                         </label>
                         <input id="calendar-account-port" type="text" class="form-control operationDataKeys"
                                data-key="calendarAccountPort" maxlength="5" data-default=""
-                               placeholder="[ Required field which requires Number Input ]"/>
+                               placeholder="[ Optional field which requires Number Input ]"/>
                     </div>
 
                     <div class="wr-input-control">