diff --git a/admin/inc/class.boapplications.inc.php b/admin/inc/class.boapplications.inc.php
index 151901f7b6..eb108d7f6a 100644
--- a/admin/inc/class.boapplications.inc.php
+++ b/admin/inc/class.boapplications.inc.php
@@ -75,9 +75,9 @@
 				if(@file_exists($f))
 				{
 					include($f);
-					while(list(,$hook) = each($setup_info[$app_name]['hooks']))
+					while(is_array($setup_info[$app_name]['hooks']) && list(,$hook) = @each($setup_info[$app_name]['hooks']))
 					{
-						if(!$hooks->found_hooks[$hook][$appname])
+						if(!@$hooks->found_hooks[$hook][$app_name])
 						{
 							$this->register_hook(
 								Array(
@@ -90,5 +90,7 @@
 				}
 			}
 			Header('Location: '.$GLOBALS['phpgw']->link('/admin/index.php'));
+			$GLOBALS['phpgw']->common->phpgw_exit();
+
 		}
 	}
diff --git a/admin/setup/phpgw_en.lang b/admin/setup/phpgw_en.lang
index 70d1c10199..44cffce080 100644
--- a/admin/setup/phpgw_en.lang
+++ b/admin/setup/phpgw_en.lang
@@ -63,6 +63,7 @@ enter the title for your site	admin	en	Enter the title for your site
 enter your default FTP server	admin	en	Enter your default FTP server
 enter your HTTP proxy server	admin	en	Enter your HTTP proxy server
 enter your HTTP proxy server port	admin	en	Enter your HTTP proxy server port
+find and register all application hooks	admin	en	Find and Register all Application Hooks
 force selectbox	admin	en	Force SelectBox
 global categories	admin	en	Global Categories
 group ?	admin	en	group ?