more user registration related revamp