diff --git a/admin/accounts.php b/admin/accounts.php
index 3491cdc9f7..898f4c7710 100755
--- a/admin/accounts.php
+++ b/admin/accounts.php
@@ -14,7 +14,7 @@
   $phpgw_info = array();
   $phpgw_info["flags"] = array("currentapp" => "admin", "enable_nextmatchs_class" => True);  
   include("../header.inc.php");
-  include($phpgw_info["server"]["app_inc"]."/accounts_".$phpgw_info["server"]["account_repository"].".inc.php");
+  include(PHPGW_APP_INC . "/accounts_".$phpgw_info["server"]["account_repository"].".inc.php");
 
   $phpgw->template->set_file(array("list" => "accounts.tpl",
               			         "row"  => "accounts_row.tpl"));
diff --git a/admin/index.php b/admin/index.php
index 2e100d4ab2..76a27efd10 100755
--- a/admin/index.php
+++ b/admin/index.php
@@ -17,6 +17,7 @@
   $phpgw_info = array();
   $phpgw_info["flags"]["currentapp"] = "admin";
   include("../header.inc.php");
+
   check_code($cd);
 
   // This func called by the includes to dump a row header
@@ -49,7 +50,7 @@
 
   for( $i =0; $i < sizeof($apps); $i++) {
     $appname = $apps[$i];
-    $f = $phpgw_info["server"]["server_root"] . "/" . $appname . "/inc/hook_admin.inc.php";
+    $f = PHPGW_SERVER_ROOT . "/" . $appname . "/inc/hook_admin.inc.php";
     if (file_exists($f)) {
       include($f);
       echo "<p>\n";