diff --git a/admin/inc/class.soapplications.inc.php b/admin/inc/class.soapplications.inc.php
index 92ddd72d23..8c4014856b 100644
--- a/admin/inc/class.soapplications.inc.php
+++ b/admin/inc/class.soapplications.inc.php
@@ -43,14 +43,19 @@
 			{
 				while ($this->db->next_record())
 				{
-					$apps[$this->db->f('app_name')] = array(
-						'title'  => $GLOBALS['phpgw_info']['apps'][$this->db->f('app_name')],
-						'name'   => $this->db->f('app_name'),
+					$app = $this->db->f('app_name');
+					$title = @$GLOBALS['phpgw_info']['apps'][$app]['title'];
+					if (empty($title))
+					{
+						$title = lang($app) == $app.'*' ? $app : lang($app);
+					}
+					$apps[$app] = array(
+						'title'  => $title,
+						'name'   => $app,
 						'status' => $this->db->f('app_enabled')
 					);
 				}
 			}
-			@reset($apps);
 			return $apps;
 		}
 
diff --git a/admin/inc/class.uiapplications.inc.php b/admin/inc/class.uiapplications.inc.php
index 240b4541c4..7bc6dd9638 100644
--- a/admin/inc/class.uiapplications.inc.php
+++ b/admin/inc/class.uiapplications.inc.php
@@ -123,7 +123,7 @@
 				$tr_color = $this->nextmatchs->alternate_row_color($tr_color);
 
 				$GLOBALS['phpgw']->template->set_var('tr_color',$tr_color);
-				$GLOBALS['phpgw']->template->set_var('name',$GLOBALS['phpgw_info']['apps'][$app['name']]['title']);
+				$GLOBALS['phpgw']->template->set_var('name',$app['title']);
 
 				$GLOBALS['phpgw']->template->set_var('edit',$can_edit ? '<a href="' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.edit&app_name=' . urlencode($app['name'])) . '&start='.$start.'"> ' . lang('Edit') . ' </a>' : '&nbsp;');
 				$GLOBALS['phpgw']->template->set_var('delete',$can_delete ? '<a href="' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.delete&app_name=' . urlencode($app['name'])) . '&start='.$start.'"> ' . lang('Delete') . ' </a>' : '&nbsp;');