Fix end user id exception