fixed user registration
merged master