diff --git a/setup/applications.php b/setup/applications.php
index d4de5d5f3a..659b879bb5 100644
--- a/setup/applications.php
+++ b/setup/applications.php
@@ -230,6 +230,14 @@ else
 	$GLOBALS['egw_setup']->html->show_header(lang('Application Management'),False,'config',$GLOBALS['egw_setup']->ConfigDomain . '(' . $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'] . ')');
 }
 
+if(@get_var('hooks', Array('GET')))
+{
+	// Find & register all application hooks
+	foreach($setup_info as $appname => $info) {
+		$GLOBALS['egw_setup']->register_hooks($appname);
+	}
+	echo lang('All hooks registered') . '<br />';
+}
 $detail = get_var('detail',Array('GET'));
 $resolve = get_var('resolve',Array('GET'));
 if(@$detail)
diff --git a/setup/inc/class.setup_html.inc.php b/setup/inc/class.setup_html.inc.php
index 6fd00707fe..0592b413d9 100644
--- a/setup/inc/class.setup_html.inc.php
+++ b/setup/inc/class.setup_html.inc.php
@@ -135,6 +135,7 @@ class setup_html
 		{
 			$btn_logout = '<a href="index.php?FormLogout=' . $logoutfrom . '" class="link">' . lang('Logout').'</a>';
 			$check_install = '<a class="textsidebox" href="check_install.php">'.lang('Check installation').'</a>';
+			$register_hooks = '<a class="textsidebox" href="applications.php?hooks=1">'.lang('Find and Register all Application Hooks').'</a>';
 		}
 
 		$GLOBALS['setup_tpl']->set_var('lang_setup', lang('setup'));
@@ -161,6 +162,7 @@ class setup_html
 			'indexbutton'   => $index_btn,
 			'indeximg'      => $index_img,
 			'check_install' => $check_install,
+			'register_hooks'=> $register_hooks,
 			'main_menu'     => lang('Setup Main Menu'),
 			'user_login'    => lang('Back to user login')
 		));
diff --git a/setup/lang/egw_en.lang b/setup/lang/egw_en.lang
index 6db6be46aa..0b6e0b0a4e 100644
--- a/setup/lang/egw_en.lang
+++ b/setup/lang/egw_en.lang
@@ -50,6 +50,7 @@ after retrieving the file, put it into place as the header.inc.php.  then, click
 all applications	setup	en	all applications
 all core tables and the admin and preferences applications	setup	en	all core tables and the admin and preferences applications
 all exit codes of the command line interface	setup	en	all exit codes of the command line interface
+all hooks registered	setup	en	All hooks registered
 all languages (incl. not listed ones)	setup	en	all languages (incl. not listed ones)
 all users	setup	en	All Users
 allow authentication via cookie	setup	en	Allow authentication via cookie
diff --git a/setup/templates/default/head.tpl b/setup/templates/default/head.tpl
index 9bb1a079ef..4d51659c68 100644
--- a/setup/templates/default/head.tpl
+++ b/setup/templates/default/head.tpl
@@ -72,6 +72,9 @@
 									<td width="20" align="center" valign="middle" class="textSidebox">{indeximg}</td><td class="textSidebox">{indexbutton}</td>
 								</tr>
 
+								<tr class="divSideboxEntry">
+									<td width="20" align="center" valign="middle" class="textSidebox"><img src="../phpgwapi/templates/idots/images/orange-ball.png" alt="ball" /></td><td class="textSidebox">{register_hooks}</td>
+								</tr>
 								<tr class="divSideboxEntry">
 									<td width="20" align="center" valign="middle" class="textSidebox"><img src="../phpgwapi/templates/idots/images/orange-ball.png" alt="ball" /></td><td class="textSidebox">{logoutbutton}</td>
 								</tr>