Modified Role Wizard Behavior