Support SSL/SSO better