diff --git a/src/main/java/org/spin/grpc/util/EnrollmentClient.java b/src/main/java/org/spin/grpc/util/EnrollmentClient.java
index 83ab2733c..4c63a0b76 100644
--- a/src/main/java/org/spin/grpc/util/EnrollmentClient.java
+++ b/src/main/java/org/spin/grpc/util/EnrollmentClient.java
@@ -53,8 +53,7 @@ public void shutdown() throws InterruptedException {
 	  public void enrollUser() {
 		  EnrollUserRequest userRequest = EnrollUserRequest.newBuilder()
 				  .setUserName("yamelsenih")
-				  .setName("Yamel")
-				  .setLastName("Senih")
+				  .setName("Yamel Senih")
 				  .setEMail("ysenih@erpya.com")
 				  .build();
 		  User response;
diff --git a/src/main/java/org/spin/grpc/util/EnrollmentServiceImplementation.java b/src/main/java/org/spin/grpc/util/EnrollmentServiceImplementation.java
index 1a311d706..54961beab 100644
--- a/src/main/java/org/spin/grpc/util/EnrollmentServiceImplementation.java
+++ b/src/main/java/org/spin/grpc/util/EnrollmentServiceImplementation.java
@@ -254,9 +254,6 @@ private User.Builder enrollUser(EnrollUserRequest request) {
 		//	Create
 		MUser newUser = new MUser(Env.getCtx(), 0, null);
 		newUser.setName(request.getName());
-		if(!Util.isEmpty(request.getLastName())) {
-			newUser.setName(newUser.getName() + " " + request.getLastName());
-		}
 		//	Add Email
 		newUser.setEMail(request.getEMail());
 		newUser.setValue(request.getUserName());
diff --git a/src/main/proto/enrollment.proto b/src/main/proto/enrollment.proto
index 40ef023a8..e1b376fc1 100644
--- a/src/main/proto/enrollment.proto
+++ b/src/main/proto/enrollment.proto
@@ -37,7 +37,6 @@ service EnrollmentService {
 message EnrollUserRequest {
 	string userName = 1;
 	string name = 2;
-	string lastName = 3;
 	string eMail = 4;
 	string clientVersion = 5;
 	string applicationType = 6;