This is a fix to #4895.
Currently the user data will not be populated correctly after a user in
UAA is logged in.  This problem is fixed in this commit.