user identity handling fix