More user registration work