Fix symmetric authentication override for explicit credentials vs environment variables

Fix symmetric authentication override for explicit credentials vs environment variables #1625