diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/operations/util/OperationReply.java b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/operations/util/OperationReply.java
index ae2a768b7..0d8252dee 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/operations/util/OperationReply.java
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/operations/util/OperationReply.java
@@ -165,12 +165,11 @@ public class OperationReply {
         SyncmlBody sourceSyncmlBody = syncmlDocument.getBody();
         SyncmlHeader sourceHeader = syncmlDocument.getHeader();
         StatusTag headerStatus;
-        ChallengeTag challengeTag;
-        challengeTag = new ChallengeTag();
+        ChallengeTag challengeTag = new ChallengeTag();
         MetaTag metaTag = new MetaTag();
-        metaTag.setFormat("b64");
-        metaTag.setType("syncml:auth-md5");
-        metaTag.setNextNonce("ZHVtbXk=");
+        metaTag.setFormat(Constants.CRED_FORMAT);
+        metaTag.setType(Constants.CRED_TYPE);
+        metaTag.setNextNonce(Constants.INITIAL_NONCE);
         challengeTag.setMeta(metaTag);
         SyncmlBody syncmlBodyReply = new SyncmlBody();
         List<StatusTag> statuses = new ArrayList<>();
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/dto/MobileDevice.java b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/dto/MobileDevice.java
index 7618ab85f..77b70de3b 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/dto/MobileDevice.java
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/dto/MobileDevice.java
@@ -39,7 +39,6 @@ public class MobileDevice implements Serializable {
     private String serial;
     private String osBuildDate;
 
-
     private Map<String, String> deviceProperties;
 
     public MobileDevice() {