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