Use || and add check for :8888. Closes #1751