diff --git a/src/assets/views/templates/BaseTemplate.svelte b/src/assets/views/templates/BaseTemplate.svelte
index ac8ad85..9b27141 100644
--- a/src/assets/views/templates/BaseTemplate.svelte
+++ b/src/assets/views/templates/BaseTemplate.svelte
@@ -11,6 +11,9 @@
     export let noHeader: boolean = false;
     export let noH1: boolean = false;
     export let noFooter: boolean = false;
+
+    export let noLogoLabel = false;
+    export let noLoginLink = false;
 </script>
 
 <CommonScripts/>
@@ -50,7 +53,7 @@
 </svelte:head>
 
 {#if !noHeader}
-    <BaseHeader/>
+    <BaseHeader {noLogoLabel} {noLoginLink}/>
 {/if}
 
 <div class="flash-messages">
diff --git a/src/assets/views/templates/base/BaseHeader.svelte b/src/assets/views/templates/base/BaseHeader.svelte
index 32e6c31..3df399b 100644
--- a/src/assets/views/templates/base/BaseHeader.svelte
+++ b/src/assets/views/templates/base/BaseHeader.svelte
@@ -3,6 +3,9 @@
     import NavMenu from "../../components/NavMenu.svelte";
     import BaseNavMenuLinks from "./BaseNavMenuLinks.svelte";
     import BaseNavMenuAuth from "./BaseNavMenuAuth.svelte";
+
+    export let noLoginLink = false;
+    export let noLogoLabel = false;
 </script>
 
 <style lang="scss">
@@ -35,9 +38,9 @@
 </style>
 
 <header>
-    <BaseHeaderLogo/>
+    <BaseHeaderLogo noLabel={noLogoLabel}/>
     <NavMenu>
         <BaseNavMenuLinks/>
-        <BaseNavMenuAuth/>
+        <BaseNavMenuAuth {noLoginLink}/>
     </NavMenu>
 </header>
diff --git a/src/assets/views/templates/base/BaseHeaderLogo.svelte b/src/assets/views/templates/base/BaseHeaderLogo.svelte
index b964873..4efd373 100644
--- a/src/assets/views/templates/base/BaseHeaderLogo.svelte
+++ b/src/assets/views/templates/base/BaseHeaderLogo.svelte
@@ -1,5 +1,7 @@
 <script>
     import {locals} from "../../../ts/stores.js";
+
+    export let noLabel = false;
 </script>
 
 <style lang="scss">
@@ -23,4 +25,9 @@
     }
 </style>
 
-<a href="/" class="logo"><img src="/img/logo.svg" alt="{$locals.app.name} logo"> {$locals.app.name}</a>
+<a href="/" class="logo">
+    <img src="/img/logo.svg" alt="{$locals.app.name} logo">
+    {#if !noLabel}
+        <span class="label">{$locals.app.name}</span>
+    {/if}
+</a>
diff --git a/src/assets/views/templates/base/BaseNavMenuAuth.svelte b/src/assets/views/templates/base/BaseNavMenuAuth.svelte
index 052ea70..03b4544 100644
--- a/src/assets/views/templates/base/BaseNavMenuAuth.svelte
+++ b/src/assets/views/templates/base/BaseNavMenuAuth.svelte
@@ -2,6 +2,8 @@
     import {locals} from "../../../ts/stores.js";
     import NavMenuItem from "../../components/NavMenuItem.svelte";
     import {hasRoute, route} from "../../../../common/Routing";
+
+    export let noLoginLink = false;
 </script>
 
 {#if hasRoute('auth')}
@@ -12,7 +14,7 @@
 
         <NavMenuItem href={route('account')} icon="user" text={$locals.user.name || 'Account'}/>
         <NavMenuItem href={route('logout')} icon="log-out" text="Logout" action/>
-    {:else}
+    {:else if !noLoginLink}
         <NavMenuItem href={route('auth')} icon="log-in" text="Log in / Register"/>
     {/if}
 {/if}