UserIdentity changes
Merge pull request #1 from caoluc/task/1

UserIdentity changes