diff --git a/setup/applications.php b/setup/applications.php
index 85855d2b7e..9baa28dc5d 100644
--- a/setup/applications.php
+++ b/setup/applications.php
@@ -162,23 +162,24 @@
 				echo '<br>' . $setup_info[$appname]['title'] . ' '
 					. lang('tables installed, unless there are errors printed above') . '.';
 			}
-
-			if ($phpgw_setup->app_registered($setup_info[$appname]['name']))
-			{
-				$phpgw_setup->update_app($setup_info[$appname]['name']);
-			}
 			else
 			{
-				$phpgw_setup->register_app($setup_info[$appname]['name']);
-			}
-			echo '<br>' . $setup_info[$appname]['title'] . ' ' . lang('registered') . '.';
+				if ($phpgw_setup->app_registered($setup_info[$appname]['name']))
+				{
+					$phpgw_setup->update_app($setup_info[$appname]['name']);
+				}
+				else
+				{
+					$phpgw_setup->register_app($setup_info[$appname]['name']);
+				}
+				echo '<br>' . $setup_info[$appname]['title'] . ' ' . lang('registered') . '.';
 
-			if ($setup_info[$appname]['hooks'])
-			{
-				$phpgw_setup->register_hooks($setup_info[$appname]['name']);
-				echo '<br>' . $setup_info[$appname]['title'] . ' ' . lang('hooks registered') . '.';
+				if ($setup_info[$appname]['hooks'])
+				{
+					$phpgw_setup->register_hooks($setup_info[$appname]['name']);
+					echo '<br>' . $setup_info[$appname]['title'] . ' ' . lang('hooks registered') . '.';
+				}
 			}
-
 			$phpgw_setup->add_langs($appname);
 			echo '<br>' . $setup_info[$appname]['title'] . ' ' . lang('Translations added') . '.';
 		}