Moving the assignment of identity data

The identity data was being set too late in the auth cycle for some upgrade scenarios.