Fixed problem with new user default role allocation
Clean up user creation