diff --git a/knowage-core/src/main/java/it/eng/spagobi/signup/service/rest/Signup.java b/knowage-core/src/main/java/it/eng/spagobi/signup/service/rest/Signup.java
index cbd4822b50..4ce45063de 100644
--- a/knowage-core/src/main/java/it/eng/spagobi/signup/service/rest/Signup.java
+++ b/knowage-core/src/main/java/it/eng/spagobi/signup/service/rest/Signup.java
@@ -220,8 +220,8 @@ public String update(@Valid SignupDTO signupDTO) {
 		MessageBuilder msgBuilder = new MessageBuilder();
 		Locale locale = msgBuilder.getLocale(request);
 
-		String name = signupDTO.getName();
-		String surname = signupDTO.getSurname();
+		String name = signupDTO.getName() != null ? signupDTO.getName() : "";
+		String surname = signupDTO.getSurname() != null ? signupDTO.getSurname() : "";
 		String password = signupDTO.getPassword();
 		String email = signupDTO.getEmail();
 
@@ -246,9 +246,18 @@ public String update(@Valid SignupDTO signupDTO) {
 
 			int userId = user.getId();
 
+<<<<<<< HEAD
 			user.setFullName(name + " " + surname);
 			if (password != null && !password.equals(DEFAULT_PASSWORD)) {
 				user.setPassword(Password.hashPassword(password));
+=======
+			if(!name.isEmpty() && !surname.isEmpty()) {				
+				user.setFullName(name + " " + surname);
+			}
+			
+			if (password != null && !password.equals(defaultPassword)) {
+				user.setPassword(Password.encriptPassword(password));
+>>>>>>> c4ed5cc473 ([KNOWAGE-8565] Added name and surname checks for new interface)
 			}
 
 			userDao.updateSbiUser(user, userId);
@@ -272,9 +281,11 @@ public String update(@Valid SignupDTO signupDTO) {
 			}
 
 			updAttribute(userDao, attrDao, email, user.getUserId(), userId, currEmail);
-
-			profile.setAttributeValue("name", name);
-			profile.setAttributeValue("surname", surname);
+			
+			if(!name.isEmpty() && !surname.isEmpty()) {				
+				profile.setAttributeValue("name", name);
+				profile.setAttributeValue("surname", surname);
+			}
 			profile.setAttributeValue("email", email);
 
 		} catch (Throwable t) {