diff --git a/backend/views/index.pug b/backend/views/index.pug
index 1c6c20e..1053bc8 100644
--- a/backend/views/index.pug
+++ b/backend/views/index.pug
@@ -3,5 +3,5 @@ extends layout
 block content
   h1= title
   p Welcome to #{title}! 
-    a(href="/logout") Want so say goodbye?
+    a(href=baseUrl+"/logout") Want so say goodbye?
   p This name is fetched on server-side: #{email}
diff --git a/backend/views/layout.pug b/backend/views/layout.pug
index 0228ac8..6a749c8 100644
--- a/backend/views/layout.pug
+++ b/backend/views/layout.pug
@@ -1,4 +1,4 @@
-- const baseUrl = DefaultConfig.EXTERNAL_BASE_URL;
+- const baseUrl = DefaultConfig.EXTERNAL_BASE_URL || DefaultConfig.BASE_PATH;
 doctype html
 html
   head