diff --git a/e107_admin/cpage.php b/e107_admin/cpage.php
index 06f43f5bd..1a13e3148 100644
--- a/e107_admin/cpage.php
+++ b/e107_admin/cpage.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/cpage.php,v $
-|     $Revision: 1.7 $
-|     $Date: 2007-10-08 20:18:11 $
+|     $Revision: 1.8 $
+|     $Date: 2008-07-09 20:08:09 $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
@@ -125,10 +125,11 @@ class page
 
 			foreach($pages as $pge)
 			{
+			  $title_text = $pge['page_title'] ? $pge['page_title'] : ($pge['page_theme'] ? CUSLAN_43.$pge['page_theme'] : CUSLAN_44);
 				$text .= "
 				<tr>
 				<td style='width:5%; text-align: center;' class='forumheader3'>{$pge['page_id']}</td>
-				<td style='width:60%' class='forumheader3'><a href='".($pge['page_theme'] ? e_ADMIN."menus.php" : e_BASE."page.php?{$pge['page_id']}" )."'>{$pge['page_title']}</a></td>
+				<td style='width:60%' class='forumheader3'><a href='".($pge['page_theme'] ? e_ADMIN."menus.php" : e_BASE."page.php?{$pge['page_id']}" )."'>{$title_text}</a></td>
 				<td style='width:15%; text-align: center;' class='forumheader3'>".($pge['page_theme'] ? "menu" : "page")."</td>
 				<td style='width:20%; text-align: center;' class='forumheader3'>
 				<a href='".e_SELF."?".($pge['page_theme'] ? "createm": "create").".edit.{$pge['page_id']}'>".ADMIN_EDIT_ICON."</a>
diff --git a/e107_languages/English/admin/lan_cpage.php b/e107_languages/English/admin/lan_cpage.php
index 591aab03b..ab30586e3 100644
--- a/e107_languages/English/admin/lan_cpage.php
+++ b/e107_languages/English/admin/lan_cpage.php
@@ -4,9 +4,9 @@
 |     e107 website system - Language File.
 |
 |     $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_cpage.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:34:40 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.2 $
+|     $Date: 2008-07-09 20:08:16 $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 define("CUSLAN_1", "Title");
@@ -51,5 +51,7 @@ define("CUSLAN_40", "Save Options");
 
 define("CUSLAN_41", "Display author and date information");
 define("CUSLAN_42", "No pages defined yet");
+define('CUSLAN_43', 'untitled menu: ');
+define('CUSLAN_44', 'untitled page');
 
 ?>
\ No newline at end of file