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