Moving the assignment of identity data
Merge pull request #656 from khawkins/move_identity_assignment

Moving the assignment of identity data