diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/client/domain/Client.java b/mifosng-provider/src/main/java/org/mifosng/platform/client/domain/Client.java
index 5e7683abf..0d46f30b5 100644
--- a/mifosng-provider/src/main/java/org/mifosng/platform/client/domain/Client.java
+++ b/mifosng-provider/src/main/java/org/mifosng/platform/client/domain/Client.java
@@ -112,7 +112,7 @@ public class Client extends AbstractAuditableCustom<AppUser, Long> {
 			this.lastName = command.getLastname();
 		}
 		
-		if (command.isClientOrBusinessNameChanged()) {
+		if (command.isClientOrBusinessNameChanged() && StringUtils.isNotBlank(command.getClientOrBusinessName())) {
 			this.lastName = command.getClientOrBusinessName();
 			this.firstName = null;
 		}