BS-8194 Add Custom User Information in the organization wizard