diff --git a/phpgwapi/inc/phpgw.inc.php b/phpgwapi/inc/phpgw.inc.php
index 3244fc7ee8..abb6673b70 100644
--- a/phpgwapi/inc/phpgw.inc.php
+++ b/phpgwapi/inc/phpgw.inc.php
@@ -425,8 +425,12 @@
      * Load the app include files if the exists                                 *
      \**************************************************************************/
      /* Then the include file */
-     if ($phpgw_info["flags"]["nonavbar"] && file_exists ($phpgw_info["server"]["app_inc"]."/functions.inc.php")){
+     if (file_exists ($phpgw_info["server"]["app_inc"]."/functions.inc.php")){
         include($phpgw_info["server"]["app_inc"]."/functions.inc.php");
      }
+
+     if (! $phpgw_info["flags"]["noappheader"] && file_exists ($phpgw_info["server"]["app_inc"]."/header.inc.php")) {
+        include($phpgw_info["server"]["app_inc"]."/header.inc.php");
+     }
   }
   error_reporting(7);
diff --git a/phpgwapi/inc/phpgw_common.inc.php b/phpgwapi/inc/phpgw_common.inc.php
index 0412c47342..ffa16615ba 100644
--- a/phpgwapi/inc/phpgw_common.inc.php
+++ b/phpgwapi/inc/phpgw_common.inc.php
@@ -578,7 +578,7 @@
         include($phpgw_info["server"]["app_inc"]."/functions.inc.php");
        }
 
-       if (file_exists ($phpgw_info["server"]["app_inc"]."/header.inc.php")) {
+       if (! $phpgw_info["flags"]["noappnavbar"] && file_exists ($phpgw_info["server"]["app_inc"]."/header.inc.php")) {
           include($phpgw_info["server"]["app_inc"]."/header.inc.php");
        }
     }