diff --git a/phpgwapi/inc/phpgw.inc.php b/phpgwapi/inc/phpgw.inc.php
index 5db5dcac58..3244fc7ee8 100644
--- a/phpgwapi/inc/phpgw.inc.php
+++ b/phpgwapi/inc/phpgw.inc.php
@@ -417,7 +417,7 @@
      /**************************************************************************\
      * Load the header unless the developer turns it off                        *
      \**************************************************************************/
-     if (!isset($phpgw_info["flags"]["noheader"]) || ! $phpgw_info["flags"]["noheader"]) {
+     if (! $phpgw_info["flags"]["noheader"]) {
         $phpgw->common->phpgw_header();
      }
 
@@ -425,7 +425,7 @@
      * Load the app include files if the exists                                 *
      \**************************************************************************/
      /* Then the include file */
-     if (file_exists ($phpgw_info["server"]["app_inc"]."/functions.inc.php")){
+     if ($phpgw_info["flags"]["nonavbar"] && file_exists ($phpgw_info["server"]["app_inc"]."/functions.inc.php")){
         include($phpgw_info["server"]["app_inc"]."/functions.inc.php");
      }
   }
diff --git a/phpgwapi/inc/phpgw_common.inc.php b/phpgwapi/inc/phpgw_common.inc.php
index 9b1d4e195c..0412c47342 100644
--- a/phpgwapi/inc/phpgw_common.inc.php
+++ b/phpgwapi/inc/phpgw_common.inc.php
@@ -574,6 +574,10 @@
        * 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")){
+        include($phpgw_info["server"]["app_inc"]."/functions.inc.php");
+       }
+
        if (file_exists ($phpgw_info["server"]["app_inc"]."/header.inc.php")) {
           include($phpgw_info["server"]["app_inc"]."/header.inc.php");
        }