Fixes #6974 - Hitting Cancel button on New Org > Manually Assign goes to 404