Issue #1905634 by angrytoast, Murz, dalin: Fixed Use the HTTPS version when necessary and only when necessary.