diff --git a/warpgate-sso/src/config.rs b/warpgate-sso/src/config.rs
index 623c4223..ca18311a 100644
--- a/warpgate-sso/src/config.rs
+++ b/warpgate-sso/src/config.rs
@@ -155,14 +155,13 @@ impl SsoInternalProviderConfig {
             }
             SsoInternalProviderConfig::Custom { issuer_url, .. } => {
                 let mut url = issuer_url.url().clone();
-                let path = url.path().to_owned();
-                if let Some(path) = path.strip_suffix("/.well-known/openid-configuration") {
-                    url.set_path(path);
-                    let url_string = url.to_string();
-                    IssuerUrl::new(url_string.trim_end_matches('/').into())?
-                } else {
-                    issuer_url.clone()
-                }
+                let path = url.path();
+                let path = path
+                    .strip_suffix(".well-known/openid-configuration")
+                    .unwrap_or(path)
+                    .to_owned();
+                url.set_path(&path);
+                IssuerUrl::from_url(url)
             }
         })
     }