Improvement on adding user