diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/bug-report.md
rename to .github/ISSUE_TEMPLATE/bug_report.md
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature_request.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/feature-request.md
rename to .github/ISSUE_TEMPLATE/feature_request.md
diff --git a/handlers.go b/handlers.go
index d04c285f..5d8b0e03 100644
--- a/handlers.go
+++ b/handlers.go
@@ -348,6 +348,9 @@ func (r *oauthProxy) logoutHandler(w http.ResponseWriter, req *http.Request) {
 	// @check if we should redirect to the provider
 	if r.config.EnableLogoutRedirect {
 		sendTo := fmt.Sprintf("%s/protocol/openid-connect/logout", strings.TrimSuffix(r.config.DiscoveryURL, "/.well-known/openid-configuration"))
+		if r.idp.EndSessionEndpoint != nil {
+			sendTo = r.idp.EndSessionEndpoint.String()
+		}
 
 		// @step: if no redirect uri is set
 		if redirectURL == "" {