4 files changed, 27 insertions, 4 deletions
diff --git a/client/components/main/header.jade b/client/components/main/header.jade
index 2751c0cc..e21ce096 100644
--- a/client/components/main/header.jade
+++ b/client/components/main/header.jade
@@ -47,6 +47,7 @@ template(name="header")
       +Template.dynamic(template=headerBar)
 
       unless hideLogo
+
         //-
           On sandstorm, the logo shouldn't be clickable, because we only have one
           page/document on it, and we don't want to see the home page containing
@@ -55,8 +56,9 @@ template(name="header")
           .wekan-logo
             img(src="{{pathFor '/wekan-logo-header.png'}}" alt="Wekan")
         else
-          a.wekan-logo(href="{{pathFor 'home'}}" title="{{_ 'header-logo-title'}}")
-            img(src="{{pathFor '/wekan-logo-header.png'}}" alt="Wekan")
+          unless currentSetting.hideLogo
+            a.wekan-logo(href="{{pathFor 'home'}}" title="{{_ 'header-logo-title'}}")
+              img(src="{{pathFor '/wekan-logo-header.png'}}" alt="Wekan")
 
   if appIsOffline
     +offlineWarning
diff --git a/client/components/main/header.js b/client/components/main/header.js
index 7fbc5716..c05b1c3c 100644
--- a/client/components/main/header.js
+++ b/client/components/main/header.js
@@ -1,11 +1,16 @@
 Meteor.subscribe('user-admin');
 Meteor.subscribe('boards');
+Meteor.subscribe('setting');
 
 Template.header.helpers({
   wrappedHeader() {
     return !Session.get('currentBoard');
   },
 
+  currentSetting() {
+    return Settings.findOne();
+  },
+
   hideLogo() {
     return Utils.isMiniScreen() && Session.get('currentBoard');
   },
diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade
index 68876dc5..e434eaba 100644
--- a/client/components/main/layouts.jade
+++ b/client/components/main/layouts.jade
@@ -14,8 +14,13 @@ head
 
 template(name="userFormsLayout")
   section.auth-layout
-    h1.at-form-landing-logo
-      img(src="{{pathFor '/wekan-logo.png'}}" alt="Wekan")
+    unless currentSetting.hideLogo
+      h1.at-form-landing-logo
+        img(src="{{pathFor '/wekan-logo.png'}}" alt="Wekan")
+    if currentSetting.hideLogo
+      h1
+        br
+        br
     section.auth-dialog
       +Template.dynamic(template=content)
       +connectionMethod
diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js
index 393f890b..d4a9d6d1 100644
--- a/client/components/main/layouts.js
+++ b/client/components/main/layouts.js
@@ -20,7 +20,13 @@ const validator = {
   },
 };
 
+Template.userFormsLayout.onCreated(() => {
+  Meteor.subscribe('setting');
+
+});
+
 Template.userFormsLayout.onRendered(() => {
+
   AccountsTemplates.state.form.keys = new Proxy(AccountsTemplates.state.form.keys, validator);
 
   const i18nTag = navigator.language;
@@ -31,6 +37,11 @@ Template.userFormsLayout.onRendered(() => {
 });
 
 Template.userFormsLayout.helpers({
+
+  currentSetting() {
+    return Settings.findOne();
+  },
+
   languages() {
     return _.map(TAPi18n.getLanguages(), (lang, code) => {
       const tag = code;