diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/ChangePasswordCommandValidator.java b/mifosng-provider/src/main/java/org/mifosng/platform/ChangePasswordCommandValidator.java
deleted file mode 100644
index b79e18833..000000000
--- a/mifosng-provider/src/main/java/org/mifosng/platform/ChangePasswordCommandValidator.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.mifosng.platform;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.lang.StringUtils;
-import org.mifosng.data.ErrorResponse;
-import org.mifosng.data.command.ChangePasswordCommand;
-import org.mifosng.platform.exceptions.NewDataValidationException;
-
-public class ChangePasswordCommandValidator {
-
-	private final ChangePasswordCommand command;
-
-	public ChangePasswordCommandValidator(ChangePasswordCommand command) {
-		this.command = command;
-	}
-
-	public void validate() {
-		List<ErrorResponse> dataValidationErrors = new ArrayList<ErrorResponse>();
-		
-		if (StringUtils.isBlank(command.getPassword())) {
-			ErrorResponse error = new ErrorResponse("validation.msg.changepassword.password.cannot.be.blank", "password");
-			dataValidationErrors.add(error);
-		}
-		
-		if (StringUtils.isBlank(command.getPasswordrepeat())) {
-			ErrorResponse error = new ErrorResponse("validation.msg.changepassword.passwordrepeat.cannot.be.blank", "passwordrepeat");
-			dataValidationErrors.add(error);
-		} else {
-			if (!command.getPasswordrepeat().equals(command.getPassword())) {
-				ErrorResponse error = new ErrorResponse("validation.msg.changepassword.passwordrepeat.not.the.same", "passwordrepeat");
-				dataValidationErrors.add(error);
-			}
-		}
-		
-		if (!dataValidationErrors.isEmpty()) {
-			throw new NewDataValidationException(dataValidationErrors, "Data validation errors exist.");
-		}
-	}
-}
\ No newline at end of file
diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/AppUserWritePlatformServiceJpaRepositoryImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/user/service/AppUserWritePlatformServiceJpaRepositoryImpl.java
index 936cb62bc..979ae3711 100644
--- a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/AppUserWritePlatformServiceJpaRepositoryImpl.java
+++ b/mifosng-provider/src/main/java/org/mifosng/platform/user/service/AppUserWritePlatformServiceJpaRepositoryImpl.java
@@ -11,7 +11,6 @@ import org.apache.commons.lang.StringUtils;
 import org.mifosng.data.ApiParameterError;
 import org.mifosng.data.command.ChangePasswordCommand;
 import org.mifosng.data.command.UserCommand;
-import org.mifosng.platform.ChangePasswordCommandValidator;
 import org.mifosng.platform.exceptions.PlatformApiDataValidationException;
 import org.mifosng.platform.exceptions.PlatformDataIntegrityException;
 import org.mifosng.platform.exceptions.PlatformResourceNotFoundException;
diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/ChangePasswordCommandValidator.java b/mifosng-provider/src/main/java/org/mifosng/platform/user/service/ChangePasswordCommandValidator.java
new file mode 100644
index 000000000..ac48b6f81
--- /dev/null
+++ b/mifosng-provider/src/main/java/org/mifosng/platform/user/service/ChangePasswordCommandValidator.java
@@ -0,0 +1,41 @@
+package org.mifosng.platform.user.service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang.StringUtils;
+import org.mifosng.data.ApiParameterError;
+import org.mifosng.data.command.ChangePasswordCommand;
+import org.mifosng.platform.exceptions.PlatformApiDataValidationException;
+
+public class ChangePasswordCommandValidator {
+
+	private final ChangePasswordCommand command;
+
+	public ChangePasswordCommandValidator(ChangePasswordCommand command) {
+		this.command = command;
+	}
+
+	public void validate() {
+		List<ApiParameterError> dataValidationErrors = new ArrayList<ApiParameterError>();
+		
+		if (StringUtils.isBlank(command.getPassword())) {
+			ApiParameterError error = ApiParameterError.parameterError("validation.msg.changepassword.password.cannot.be.blank", "The parameter password cannot be blank.", "password");
+			dataValidationErrors.add(error);
+		}
+		
+		if (StringUtils.isBlank(command.getPasswordrepeat())) {
+			ApiParameterError error = ApiParameterError.parameterError("validation.msg.changepassword.passwordrepeat.cannot.be.blank", "The parameter passwordrepeat cannot be blank.", "passwordrepeat");
+			dataValidationErrors.add(error);
+		} else {
+			if (!command.getPasswordrepeat().equals(command.getPassword())) {
+				ApiParameterError error = ApiParameterError.parameterError("validation.msg.changepassword.passwordrepeat.not.the.same", "The parameter passwordrepeat cannot be blank.", "passwordrepeat");
+				dataValidationErrors.add(error);
+			}
+		}
+		
+		if (!dataValidationErrors.isEmpty()) {
+			throw new PlatformApiDataValidationException("validation.msg.validation.errors.exist", "Validation errors exist.", dataValidationErrors);
+		}
+	}
+}
\ No newline at end of file