adding proper user registration
fixing merge