diff --git a/docbook/reference/en/en-US/modules/server-installation.xml b/docbook/reference/en/en-US/modules/server-installation.xml
index c6b253c50c..3a0d57bcb9 100755
--- a/docbook/reference/en/en-US/modules/server-installation.xml
+++ b/docbook/reference/en/en-US/modules/server-installation.xml
@@ -332,7 +332,7 @@ $ keytool -import -alias yourdomain -keystore keycloak.jks -file your-certificat
                     </programlisting>
                 </para>
                 <para>
-                    Check the <ulink url="https://docs.jboss.org/author/display/WFLY8/SSL+setup+guide">Wildfly</ulink> documentation for more information on fine tuning the socket connections.
+                    Check the <ulink url="https://docs.jboss.org/author/display/WFLY8/Undertow+(web)+subsystem+configuration">Wildfly Undertow</ulink> documentation for more information on fine tuning the socket connections.
                 </para>
             </section>
             <section>
diff --git a/services/src/main/java/org/keycloak/services/resources/TokenService.java b/services/src/main/java/org/keycloak/services/resources/TokenService.java
index 2ce30a524d..6871b9f897 100755
--- a/services/src/main/java/org/keycloak/services/resources/TokenService.java
+++ b/services/src/main/java/org/keycloak/services/resources/TokenService.java
@@ -637,15 +637,7 @@ public class TokenService {
             return true;
         }
 
-        if (uriInfo.getBaseUri().getScheme().equals("https")) {
-            return true;
-        }
-
-        if ("https".equals(headers.getHeaderString("X-Forwarded-Proto"))) {
-            return true;
-        }
-
-        return false;
+        return uriInfo.getBaseUri().getScheme().equals("https");
     }
 
 }