Additional small tweak to prevent header from being set with no credentials