BS-8184 Fix Finish behavior in User Wizard Page