Cleaned up user registration