diff --git a/addressbook/inc/preferences.inc.php b/addressbook/inc/hook_preferences.inc.php
similarity index 100%
rename from addressbook/inc/preferences.inc.php
rename to addressbook/inc/hook_preferences.inc.php
diff --git a/admin/inc/admin.inc.php b/admin/inc/hook_admin.inc.php
similarity index 100%
rename from admin/inc/admin.inc.php
rename to admin/inc/hook_admin.inc.php
diff --git a/calendar/inc/preferences.inc.php b/calendar/inc/hook_preferences.inc.php
similarity index 100%
rename from calendar/inc/preferences.inc.php
rename to calendar/inc/hook_preferences.inc.php
diff --git a/preferences/inc/preferences.inc.php b/preferences/inc/hook_preferences.inc.php
similarity index 91%
rename from preferences/inc/preferences.inc.php
rename to preferences/inc/hook_preferences.inc.php
index dabf9de779..f07e67ce4d 100644
--- a/preferences/inc/preferences.inc.php
+++ b/preferences/inc/hook_preferences.inc.php
@@ -1,5 +1,6 @@
 <?php
 {
+  echo "<p>\n";
   $img = "/" . $appname . "/images/" . $appname .".gif";
   if (file_exists($phpgw_info["server"]["server_root"].$img)) {
     $img = $phpgw_info["server"]["webserver_url"].$img;
@@ -15,7 +16,7 @@
 
 
   // Actual content
-  echo "<br><a href=\"" . $phpgw->link("changepassword.php") . "\">"
+  echo "<a href=\"" . $phpgw->link("changepassword.php") . "\">"
      . lang("change your password") . "</a>";
   echo "<br><a href=\"" . $phpgw->link("changetheme.php") . "\">"
      . lang("select different theme") . "</a>";
diff --git a/preferences/index.php b/preferences/index.php
index e73bf31762..c49fadf3ec 100755
--- a/preferences/index.php
+++ b/preferences/index.php
@@ -37,18 +37,7 @@
     echo "</TD></TR></TABLE>\n\n";
   }
 
-  // The account stuff that should be at the top of the list
-  $appname = "preferences";
-  $f = $phpgw_info["server"]["server_root"] . "/" . $appname . "/inc/preferences.inc.php";
-  if (file_exists($f)) {
-    include($f);
-  }
-  while (list(,$appname) = each($phpgw_info["user"]["app_perms"])) {
-	$f = $phpgw_info["server"]["server_root"] . "/" . $appname . "/inc/preferences.inc.php";
-	if (file_exists($f)) {
-		echo "<p>\n";
-		include($f);
-	}
-  }
+  $phpgw->common->hook();
+
   $phpgw->common->phpgw_footer();
 ?>