Protect proxy credentials, close #1720