Fix/npe user identifier