diff --git a/admin/accounts.php b/admin/accounts.php
index d3d45025c8..67d2f0cc3b 100755
--- a/admin/accounts.php
+++ b/admin/accounts.php
@@ -14,8 +14,7 @@
   $phpgw_info = array();
   $phpgw_info["flags"] = array("currentapp" => "admin", "enable_nextmatchs_class" => True);  
   include("../header.inc.php");
-  include($phpgw_info["server"]["server_root"] . "/admin/inc/accounts_"
-        . $phpgw_info["server"]["account_repository"] . ".inc.php");
+  include($phpgw_info["server"]["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/deleteaccount.php b/admin/deleteaccount.php
index 85c16b926b..3d88419e27 100755
--- a/admin/deleteaccount.php
+++ b/admin/deleteaccount.php
@@ -20,8 +20,7 @@
   $phpgw_info["flags"]["currentapp"] = "admin";
   $phpgw_info["flags"]["enable_calendar_class"] = True;
   include("../header.inc.php");
-  include($phpgw_info["server"]["server_root"] . "/admin/inc/accounts_"
-        . $phpgw_info["server"]["account_repository"] . ".inc.php");
+  include($phpgw_info["server"]["app_inc"]."/accounts_".$phpgw_info["server"]["account_repository"].".inc.php");
 
   // I didn't active this code until all tables are up to date using the owner field
   // The calendar isn't update to date.  (jengo)
diff --git a/admin/editaccount.php b/admin/editaccount.php
index 9b21ad240d..dc86cda881 100755
--- a/admin/editaccount.php
+++ b/admin/editaccount.php
@@ -14,8 +14,7 @@
   $phpgw_info = array();
   $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True, "currentapp" => "admin");
   include("../header.inc.php");
-  include($phpgw_info["server"]["server_root"] . "/admin/inc/accounts_"
-        . $phpgw_info["server"]["account_repository"] . ".inc.php");
+  include($phpgw_info["server"]["app_inc"]."/accounts_".$phpgw_info["server"]["account_repository"].".inc.php");
 
   if (! $account_id) {
      Header("Location: " . $phpgw->link("accounts.php"));
diff --git a/admin/newaccount.php b/admin/newaccount.php
index c87f5c8dc5..7c23f7f123 100755
--- a/admin/newaccount.php
+++ b/admin/newaccount.php
@@ -14,8 +14,7 @@
   $phpgw_info = array();
   $phpgw_info["flags"] = array("currentapp" => "admin", "noheader" => True, "nonavbar" => True);
   include("../header.inc.php");
-  include($phpgw_info["server"]["server_root"] . "/admin/inc/accounts_"
-        . $phpgw_info["server"]["account_repository"] . ".inc.php");
+  include($phpgw_info["server"]["app_inc"]."/accounts_".$phpgw_info["server"]["account_repository"].".inc.php");
 
   function add_default_preferences($account_id)
   {
diff --git a/admin/viewaccount.php b/admin/viewaccount.php
index 572429e512..83c26d84fb 100755
--- a/admin/viewaccount.php
+++ b/admin/viewaccount.php
@@ -22,8 +22,7 @@
   $phpgw_info["flags"]["parent_page"] = "accounts.php";
 
   include("../header.inc.php");
-  include($phpgw_info["server"]["server_root"] . "/admin/inc/accounts_"
-        . $phpgw_info["server"]["account_repository"] . ".inc.php");
+  include($phpgw_info["server"]["app_inc"]."/accounts_".$phpgw_info["server"]["account_repository"].".inc.php");
 
   if (! $account_id) {
      Header("Location: " . $phpgw->link("accounts.php"));