Adding a new user
Some cleanup