As mentioned above, retain only saveUser(User, String) and appropriate logic depending on if password is null or not