Fixes #8003 - Wizard finish redirects to container