Fix using existing OS_* authentication environment vars