diff --git a/admin/inc/accounts_sql.inc.php b/admin/inc/accounts_sql.inc.php
index 63d06979c4..3647db7bdc 100755
--- a/admin/inc/accounts_sql.inc.php
+++ b/admin/inc/accounts_sql.inc.php
@@ -121,7 +121,7 @@
 		               . "account_lastpwd_change='" . time() . "' where account_lid='"
 		               . $account_info["loginid"] . "'");
 		if ($account_info["account_id"] == $phpgw_info["user"]["account_id"]) {
-		  $phpgw_info["user"]["passwd"] = $phpgw->common->encrypt($account_info["passwd"];
+ 		  $phpgw_info["user"]["passwd"] = $phpgw->common->encrypt($account_info["passwd"]);
 		}
 //        $phpgw->db->query("update phpgw_sessions set session_pwd='" . addslashes($account_info["passwd"])
 //                        . "' where session_lid='" . $account_info["loginid"] . "'");
diff --git a/phpgwapi/templates/default/navbar.inc.php b/phpgwapi/templates/default/navbar.inc.php
index e906b87ee3..1a1df3b2a4 100644
--- a/phpgwapi/templates/default/navbar.inc.php
+++ b/phpgwapi/templates/default/navbar.inc.php
@@ -28,17 +28,34 @@
         $target = ' target="' . $phpgw_info["flags"]["navbar_target"] . '"';
      }
 
+     $i = 1;
      while ($app = each($phpgw_info["navbar"])) {
-        $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") {
-           $title .= "<br>" . $app[1]["title"];
-           $tpl->set_var("width","7%");
+        if ($phpgw_info["user"]["preferences"]["common"]["navbar_format"] == "text") {
+           $tabs[$i]["label"] = $app[1]["title"];
+           $tabs[$i]["link"]  = $app[1]["url"];
+           if (ereg($phpgw_info["navbar"][$app[0]],$PHP_SELF)) {                                                                           
+              $selected = $i;                                                                       
+           }
+           $i++;
         } else {
-           $tpl->set_var("width","3%");
+           $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") {
+              $title .= "<br>" . $app[1]["title"];
+              $tpl->set_var("width","7%");
+           } else {
+              $tpl->set_var("width","3%");
+           }
+   
+           $tpl->set_var("value",'<a href="' . $app[1]["url"] . '"' . $target . '>' . $title . '</a>');
+           $tpl->set_var("align","center");
+           $tpl->parse("applications","navbar_app",True);
         }
-
-        $tpl->set_var("value",'<a href="' . $app[1]["url"] . '"' . $target . '>' . $title . '</a>');
+     }
+     if ($phpgw_info["user"]["preferences"]["common"]["navbar_format"] == "text") {
+        $tpl->set_var("navbar_color",$phpgw_info["theme"]["bg_color"]);
+        $tpl->set_var("align","right");
+        $tpl->set_var("value",$phpgw->common->create_tabs($tabs,$selected,-1));
         $tpl->parse("applications","navbar_app",True);
      }
 
diff --git a/phpgwapi/templates/default/navbar_app.tpl b/phpgwapi/templates/default/navbar_app.tpl
index 6f639d7274..7142d7603c 100644
--- a/phpgwapi/templates/default/navbar_app.tpl
+++ b/phpgwapi/templates/default/navbar_app.tpl
@@ -1 +1 @@
-<td align="center" width="{width}">{value}</td>
+<td align="{align}" width="{width}">{value}</td>