diff --git a/phpgwapi/doc/CHANGELOG b/phpgwapi/doc/CHANGELOG
index 34de399eff..8d7b0e839a 100644
--- a/phpgwapi/doc/CHANGELOG
+++ b/phpgwapi/doc/CHANGELOG
@@ -11,6 +11,7 @@
           a change to them.
         - Fixed E-Mail display inline graphics
         - Fixed free/busy displaying incorrect title date
+        - Fixed templates messing up with certian languages
 
 [0.9.8] - Merged in patch for UW-Maildir IMAP server support
           Thanks milosch
diff --git a/phpgwapi/inc/phpgw_common.inc.php b/phpgwapi/inc/phpgw_common.inc.php
index 4e00f0bc69..a28c1685ee 100644
--- a/phpgwapi/inc/phpgw_common.inc.php
+++ b/phpgwapi/inc/phpgw_common.inc.php
@@ -429,13 +429,13 @@
     
        global $phpgw_info, $phpgw;
 
-       $phpgw_info["navbar"]["home"]["title"] = lang("Home");
+       $phpgw_info["navbar"]["home"]["title"] = "Home";
        $phpgw_info["navbar"]["home"]["url"]   = $phpgw->link($phpgw_info["server"]["webserver_url"] . "/index.php");
        $phpgw_info["navbar"]["home"]["icon"]  = $phpgw_info["server"]["webserver_url"] . "/phpgwapi/templates/"
                                               . $phpgw_info["server"]["template_set"] . "/images/home.gif";
        while ($permission = each($phpgw_info["user"]["apps"])) {
           if ($phpgw_info["apps"][$permission[0]]["status"] != 2) {
-             $phpgw_info["navbar"][$permission[0]]["title"] = lang($phpgw_info["apps"][$permission[0]]["title"]);
+             $phpgw_info["navbar"][$permission[0]]["title"] = $phpgw_info["apps"][$permission[0]]["title"];
              $phpgw_info["navbar"][$permission[0]]["url"]   = $phpgw->link($phpgw_info["server"]["webserver_url"]
                                                             . "/" . $permission[0] . "/index.php");
             $icon_file = $phpgw_info["server"]["server_root"]."/".$permission[0] . "/templates/". $phpgw_info["server"]["template_set"]. "/images/navbar.gif";
@@ -448,7 +448,7 @@
             }
           }
        }
-       $phpgw_info["navbar"]["preferences"]["title"] = lang("preferences");
+       $phpgw_info["navbar"]["preferences"]["title"] = "preferences";
        $phpgw_info["navbar"]["preferences"]["url"]   = $phpgw->link($phpgw_info["server"]["webserver_url"]
                                                      . "/preferences/index.php");
        $phpgw_info["navbar"]["preferences"]["icon"]  = $phpgw_info["server"]["webserver_url"] . "/preferences/templates/"
@@ -459,13 +459,14 @@
        } else {
           $app = $phpgw_info["flags"]["currentapp"];
        }
-       $phpgw_info["navbar"]["about"]["title"] = lang("About x",$about);
+       $phpgw_info["navbar"]["about"]["title"] = lang("About x",$about);    // We handle this here
+                                                                            // becuase its special
        $phpgw_info["navbar"]["about"]["url"]   = $phpgw->link($phpgw_info["server"]["webserver_url"]
                                                . "/about.php");
        $phpgw_info["navbar"]["about"]["icon"]  = $phpgw_info["server"]["webserver_url"] . "/phpgwapi/templates/"
                                                . $phpgw_info["server"]["template_set"] . "/images/about.gif";
 
-       $phpgw_info["navbar"]["logout"]["title"] = lang("Logout");  // Add app name
+       $phpgw_info["navbar"]["logout"]["title"] = "Logout";
        $phpgw_info["navbar"]["logout"]["url"]   = $phpgw->link($phpgw_info["server"]["webserver_url"]
                                                 . "/logout.php");
        $phpgw_info["navbar"]["logout"]["icon"]  = $phpgw_info["server"]["webserver_url"] . "/phpgwapi/templates/"
diff --git a/phpgwapi/templates/justweb/navbar.inc.php b/phpgwapi/templates/justweb/navbar.inc.php
index 4533f3cee5..1a8f1d34d9 100644
--- a/phpgwapi/templates/justweb/navbar.inc.php
+++ b/phpgwapi/templates/justweb/navbar.inc.php
@@ -28,7 +28,7 @@
      }
 
      while ($app = each($phpgw_info["navbar"])) {
-        if ($app[1]["title"] != "Home" && $app[1]["title"] != "Preferences" && ! ereg("About",$app[1]["title"]) && $app[1]["title"] != "Logout") {
+        if ($app[1]["title"] != "Home" && $app[1]["title"] != "preferences" && ! ereg("About",$app[1]["title"]) && $app[1]["title"] != "Logout") {
            $title = '<img src="' . $app[1]["icon"] . '" alt="' . $app[1]["title"] . '" title="'
                    . $app[1]["title"] . '" border="0">';
            if ($phpgw_info["user"]["preferences"]["common"]["navbar_format"] == "icons_and_text") {
diff --git a/phpgwapi/templates/verdilak/navbar.inc.php b/phpgwapi/templates/verdilak/navbar.inc.php
index a307346581..3a2e47afab 100644
--- a/phpgwapi/templates/verdilak/navbar.inc.php
+++ b/phpgwapi/templates/verdilak/navbar.inc.php
@@ -28,11 +28,11 @@
      }
 
      while ($app = each($phpgw_info["navbar"])) {
-        if ($app[1]["title"] != "Home" && $app[1]["title"] != "Preferences" && ! ereg("About",$app[1]["title"]) && $app[1]["title"] != "Logout") {
+        if ($app[1]["title"] != "Home" && $app[1]["title"] != "preferences" && ! ereg("About",$app[1]["title"]) && $app[1]["title"] != "Logout") {
            $title = '<img src="' . $app[1]["icon"] . '" alt="' . $app[1]["title"] . '" title="'
-                   . $app[1]["title"] . '" border="0">';
+                   . lang($app[1]["title"]) . '" border="0">';
            if ($phpgw_info["user"]["preferences"]["common"]["navbar_format"] == "icons_and_text") {
-              $title .= "<br>" . $app[1]["title"];
+              $title .= "<br>" . lang($app[1]["title"]);
            }
            $applications .= '<br><a href="' . $app[1]["url"] . '"' . $target . '>' . $title . '</a>';
         }