diff --git a/index.php b/index.php
index 217402a260..48d3d156dd 100755
--- a/index.php
+++ b/index.php
@@ -52,6 +52,11 @@
 		$phpgw->redirect($phpgw->link($phpgw_forward,$extra_vars));
 	}
 
+	if ($phpgw_info['server']['force_default_app'] && $phpgw_info['server']['force_default_app'] != 'user_choice')
+	{
+		$phpgw_info['user']['preferences']['common']['default_app'] = $phpgw_info['server']['force_default_app'];
+	}
+
 	if (($phpgw_info['user']['preferences']['common']['useframes'] &&
 		$phpgw_info['server']['useframes'] == 'allowed') ||
 		($phpgw_info['server']['useframes'] == 'always'))
diff --git a/preferences/acl_preferences.php b/preferences/acl_preferences.php
index aa0985dd7d..4c3785aab1 100644
--- a/preferences/acl_preferences.php
+++ b/preferences/acl_preferences.php
@@ -209,6 +209,11 @@
 
 	$p->set_file($templates);
 
+	if ($submit)
+	{
+		$p->set_var('errors',lang('ACL grants have been updated'));
+	}
+
 	$common_hidden_vars = '     <input type="hidden" name="s_groups" value="'.$s_groups.'">'."\n"
 		. '     <input type="hidden" name="s_users" value="'.$s_users.'">'."\n"
 		. '     <input type="hidden" name="maxm" value="'.$maxm.'">'."\n"
diff --git a/preferences/inc/hook_config.inc.php b/preferences/inc/hook_config.inc.php
index fb5893eaf6..50e7d962d6 100644
--- a/preferences/inc/hook_config.inc.php
+++ b/preferences/inc/hook_config.inc.php
@@ -95,4 +95,33 @@
 		}
 		return $out;
 	}
+
+	function force_default_app($config)
+	{
+		global $phpgw, $phpgw_info;
+
+		$out = '<option value="user_choice"';
+		if ($config['force_default_app'] == 'user_choice')
+		{
+			$out .= ' selected';
+		}
+		$out .= '>' . lang('Users Choice') . '</option>' . "\n";
+
+		reset($phpgw_info['user']['apps']);
+		while ($permission = each($phpgw_info['user']['apps']))
+		{
+			if ($phpgw_info['apps'][$permission[0]]['status'] != 2)
+			{
+				$out .= '<option value="' . $permission[0] . '"';
+				if ($config['force_default_app'] == $permission[0])
+				{
+					$out .= ' selected';
+				}
+				$out .= '>' . lang($phpgw_info['apps'][$permission[0]]['title']) . '</option>' . "\n";
+			}
+		}
+
+		return $out;
+	}
+
 ?>
diff --git a/preferences/settings.php b/preferences/settings.php
index 29de2a394f..a3a22ee60f 100755
--- a/preferences/settings.php
+++ b/preferences/settings.php
@@ -255,7 +255,11 @@
             }
             echo "></td></tr>";
          }
-?>        
+
+			if ($phpgw_info['server']['force_default_app'] == 'user_choice')
+			{
+
+			?>        
        <tr>
         <td><?php echo lang("Default application"); ?></td>
         <td>
@@ -275,6 +279,9 @@
           ?></select>
         </td>
        </tr>
+       <?php
+			}
+			?>
 
        <tr>
         <td><?php echo lang("Currency"); ?></td>
diff --git a/preferences/templates/default/config.tpl b/preferences/templates/default/config.tpl
index 5575b5c37e..aefadadcdd 100644
--- a/preferences/templates/default/config.tpl
+++ b/preferences/templates/default/config.tpl
@@ -56,6 +56,15 @@
     </td>
    </tr>
 
+   <tr bgcolor="{row_off}">
+    <td>{lang_Force_default_application}:<br></td>
+    <td>
+     <select name="newsettings[force_default_app]">
+{hook_force_default_app}
+     </select>
+    </td>
+   </tr>
+
    <tr bgcolor="{row_on}">
     <td>{lang_Use_pure_HTML_compliant_code_(not_fully_working_yet)}:</td>
     <td>