diff --git a/phpgwapi/inc/functions.inc.php b/phpgwapi/inc/functions.inc.php
index 41d1f6c78e..c8fde2e832 100644
--- a/phpgwapi/inc/functions.inc.php
+++ b/phpgwapi/inc/functions.inc.php
@@ -492,9 +492,15 @@
 			$phpgw_info['flags']['currentapp'] != 'preferences' &&
 			$phpgw_info['flags']['currentapp'] != 'about')
 		{
-			if (! $phpgw_info['user']['apps'][$phpgw_info['flags']['currentapp']])
+			// This will need to use ACL in the future
+			if (! $phpgw_info['user']['apps'][$phpgw_info['flags']['currentapp']] || ($phpgw_info['flags']['admin_only'] && ! $phpgw_info['user']['apps']['admin']))
 			{
 				$phpgw->common->phpgw_header();
+				if ($phpgw_info['flags']['noheader'])
+				{
+					echo parse_navbar();
+				}
+
 				echo '<p><center><b>'.lang('Access not permitted').'</b></center>';
 				$phpgw->common->phpgw_exit(True);
 			}