diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/Client.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/Client.java
index ce0e0f9fc..08425f7f5 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/Client.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/Client.java
@@ -562,6 +562,13 @@ public final class Client extends AbstractPersistableCustom<Long> {
             	{
             		actualChanges.put(ClientApiConstants.legalFormIdParamName, ClientEnumerations.legalForm(newValue));
                     this.setLegalForm(legalForm.getValue());
+                    if(legalForm.isPerson()){
+                        this.fullname = null;
+                    }else if(legalForm.isEntity()){
+                        this.firstname = null;
+                        this.lastname = null;
+                        this.displayName = null;
+                    }
             	}
             	else
             	{