diff --git a/src/themes/d4science/login/template.ftl b/src/themes/d4science/login/template.ftl
index 2a423c6..87bf17a 100644
--- a/src/themes/d4science/login/template.ftl
+++ b/src/themes/d4science/login/template.ftl
@@ -25,7 +25,7 @@
       <div class="row py-3">
         <div class="col">
           <#if client??>
-            <a href="${client.getBaseUrl()!("https://" + client.getClientId())}">
+            <a href="<#if client.getBaseUrl()?has_content>${client.getBaseUrl()}<#else>${"https://" + client.getClientId()}</#if>">
               <#if properties.logoSrc?has_content>
                 <img class="img-fluid float-left" alt="${properties.logoAlt}" src="${properties.logoSrc}" style="${properties.logoStyle}">
               <#else>