diff --git a/src/auth-proxy.ts b/src/auth-proxy.ts
index eee3fb1..7976ac5 100644
--- a/src/auth-proxy.ts
+++ b/src/auth-proxy.ts
@@ -1,5 +1,5 @@
 import {Request, RequestHandler} from 'express';
-import {DefaultConfig, Logger, Resolvable, urlJoin, UserInfo} from '.';
+import {DefaultConfig, Logger, Resolvable, UserInfo} from '.';
 import fetch from 'node-fetch';
 
 const router: RequestHandler = (req: Request, res, next) => {
@@ -8,8 +8,7 @@ const router: RequestHandler = (req: Request, res, next) => {
 			return undefined;
 		}
 		const token = req.header(DefaultConfig.USERINFO_HEADER);
-		const url = DefaultConfig.AUTH_PROXY_USERINFO_URL ||
-			DefaultConfig.AUTH_PROXY_URL && urlJoin(DefaultConfig.AUTH_PROXY_URL, "userinfo");
+		const url = DefaultConfig.AUTH_PROXY_USERINFO_URL;
 		if (token === undefined || url === undefined) {
 			return undefined;
 		}
@@ -24,8 +23,7 @@ const router: RequestHandler = (req: Request, res, next) => {
 
 	req.getUserInfo = () => resolvable.resolve();
 	res.initLogout = function() {
-		const url = DefaultConfig.AUTH_PROXY_INIT_LOGOUT_URL ||
-			DefaultConfig.AUTH_PROXY_URL && urlJoin(DefaultConfig.AUTH_PROXY_URL, "init-logout");
+		const url = DefaultConfig.AUTH_PROXY_INIT_LOGOUT_URL;
 		if (url === undefined) {
 			return false;
 		}
diff --git a/src/config.ts b/src/config.ts
index 13db449..c6a4a3b 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -41,4 +41,8 @@ export const DefaultConfig = {
 			urlJoin(`http://${envs.HOSTNAME}${envs.PORT !== 80 ? `:${envs.PORT}` : ""}`, envs.BASE_PATH),
 	isProduction,
 	requireEnv,
+	AUTH_PROXY_USERINFO_URL: envs.AUTH_PROXY_USERINFO_URL ||
+		envs.AUTH_PROXY_URL && urlJoin(envs.AUTH_PROXY_URL, "userinfo"),
+	AUTH_PROXY_INIT_LOGOUT_URL: envs.AUTH_PROXY_INIT_LOGOUT_URL ||
+		envs.AUTH_PROXY_URL && urlJoin(envs.AUTH_PROXY_URL, "init-logout"),
 };