Fixed entry conditional to be sensative to invalid b/f trying to get an
authorization. (residue from previous change to pull the null token test
out of the body of first conditional)