[BUGFIX] Use correct returnUrl for AddWizard caller