# Redirect requests to the secure port
${ssl_rewrite}RewriteEngine on
-${ssl_rewrite}RewriteCond %{SERVER_PORT} !^443$$
-${ssl_rewrite}RewriteRule ^${saml_base}(.*) https://${sp_hostname}${saml_base}$$1 [L,R=301,NC]
+${ssl_rewrite}RewriteCond %{SERVER_PORT} !^${ssl_port}$$
+${ssl_rewrite}RewriteRule ^${saml_base}(.*) https://${sp_hostname}${sp_port}${saml_base}$$1 [L,R=301,NC]