Fixed an issue with User registration
Added additional safety check with Use registration