diff --git a/src/organizer.addressbook.php b/src/organizer.addressbook.php
index 8a38f96..ef4e964 100644
--- a/src/organizer.addressbook.php
+++ b/src/organizer.addressbook.php
@@ -33,6 +33,14 @@ ModuleFunction('FileHandler',
 	array(substr(__FILE__, strlen(__DIR__)+1),
 	isset($_REQUEST['action']) ? $_REQUEST['action'] : ''));
 
+/**
+ * organizer enabled?
+ */
+if($groupRow['organizer']=='no')
+{
+	header('Location: start.php?sid=' . session_id());
+	exit();
+}
 /**
  * default action = start
  */
diff --git a/src/organizer.calendar.php b/src/organizer.calendar.php
index 4d3897f..a0c1a58 100644
--- a/src/organizer.calendar.php
+++ b/src/organizer.calendar.php
@@ -31,6 +31,14 @@ RequestPrivileges(PRIVILEGES_USER);
 ModuleFunction('FileHandler',
 	array(substr(__FILE__, strlen(__DIR__)+1),
 	isset($_REQUEST['action']) ? $_REQUEST['action'] : ''));
+/**
+ * organizer enabled?
+ */
+if($groupRow['organizer']=='no')
+{
+	header('Location: start.php?sid=' . session_id());
+	exit();
+}
 
 /**
  * default action = start
diff --git a/src/organizer.notes.php b/src/organizer.notes.php
index d8dd145..bde3779 100644
--- a/src/organizer.notes.php
+++ b/src/organizer.notes.php
@@ -30,7 +30,14 @@ RequestPrivileges(PRIVILEGES_USER);
 ModuleFunction('FileHandler',
 	array(substr(__FILE__, strlen(__DIR__)+1),
 	isset($_REQUEST['action']) ? $_REQUEST['action'] : ''));
-
+/**
+ * organizer enabled?
+ */
+if($groupRow['organizer']=='no')
+{
+	header('Location: start.php?sid=' . session_id());
+	exit();
+}
 /**
  * default action = start
  */
diff --git a/src/organizer.php b/src/organizer.php
index d271cb0..4499c44 100644
--- a/src/organizer.php
+++ b/src/organizer.php
@@ -31,6 +31,14 @@ ModuleFunction('FileHandler',
 	array(substr(__FILE__, strlen(__DIR__)+1),
 	isset($_REQUEST['action']) ? $_REQUEST['action'] : ''));
 
+/**
+ * organizer enabled?
+ */
+if($groupRow['organizer']=='no')
+{
+	header('Location: start.php?sid=' . session_id());
+	exit();
+}
 /**
  * default action = start
  */
diff --git a/src/organizer.todo.php b/src/organizer.todo.php
index ce103d2..a1a71c1 100644
--- a/src/organizer.todo.php
+++ b/src/organizer.todo.php
@@ -29,7 +29,14 @@ RequestPrivileges(PRIVILEGES_USER);
 ModuleFunction('FileHandler',
 	array(substr(__FILE__, strlen(__DIR__)+1),
 	isset($_REQUEST['action']) ? $_REQUEST['action'] : ''));
-
+/**
+ * organizer enabled?
+ */
+if($groupRow['organizer']=='no')
+{
+	header('Location: start.php?sid=' . session_id());
+	exit();
+}
 /**
  * default action = start
  */
diff --git a/src/serverlib/template.class.php b/src/serverlib/template.class.php
index c102dd9..f129dc6 100644
--- a/src/serverlib/template.class.php
+++ b/src/serverlib/template.class.php
@@ -278,14 +278,16 @@ class Template extends Smarty
                 ];
             }
 
-            $pageTabs = array_merge($pageTabs, [
-                'organizer' => [
-                    'icon' => 'organizer',
-                    'faIcon' => 'fa-calendar',
-                    'link' => 'organizer.php?sid=',
-                    'text' => $lang_user['organizer'],
-                    'order' => 400,
-                ], ]);
+            if($groupRow['organizer']=="yes") {
+                $pageTabs = array_merge($pageTabs, [
+                    'organizer' => [
+                        'icon' => 'organizer',
+                        'faIcon' => 'fa-calendar',
+                        'link' => 'organizer.php?sid=',
+                        'text' => $lang_user['organizer'],
+                        'order' => 400,
+                    ], ]);
+            }
 
             if ($groupRow['webdisk'] + $userRow['diskspace_add'] > 0) {
                 $pageTabs = array_merge($pageTabs, [