issue 18: NPE when user not resolved
add mandatory fields to workaround server issue