Fix a bug where UIA for cross signing wasn't needed until after checking for it.

Fix a bug where UIA for cross signing wasn't needed until after checking for it. #3632