Changed user-id from email to hex-id