Prevent $scheme <> $password issues with any existing code