Fixed UserIdentity NullPointer Exception