Modify registration choice view and fix user pages tests