CE-568 adding check for non zero user id