Improving the handling for when principal info is passed via URL