diff --git a/src/main/scala/code/snippet/WebUI.scala b/src/main/scala/code/snippet/WebUI.scala
index f0ff9838..687b5aae 100644
--- a/src/main/scala/code/snippet/WebUI.scala
+++ b/src/main/scala/code/snippet/WebUI.scala
@@ -27,6 +27,7 @@ Berlin 13359, Germany
 
 package code.snippet
 
+import code.lib.OBPProvider.baseUrl
 import code.util.Helper
 import code.util.Helper.MdcLoggable
 import net.liftweb.http.{S, SessionVar}
@@ -69,11 +70,13 @@ class WebUI extends MdcLoggable {
 //  These copied from API but not all implemented.
 
   def headerLogoLeft = {
-    "img [src]" #> getPropsValue("webui_header_logo_left_url", "https://static.openbankproject.com/images/OBP_full_web_25pc.png")
+    "a [href]" #> baseUrl &
+    "img [src]" #> getPropsValue("webui_header_logo_left_url", "https://static.openbankproject.com/images/OBP_full_web_25pc.png") 
   }
 
   def headerLogoRight: CssSel = {
-    "img [src]" #> getPropsValue("webui_header_logo_right_url", "https://static.openbankproject.com/images/obp_logo_stacked.png")
+    "a [href] "  #> baseUrl &
+    "img [src]" #> getPropsValue("webui_header_logo_right_url", "https://static.openbankproject.com/images/obp_logo_stacked.png") 
   }
 
   def currentYearText: CssSel = {