diff --git a/admin/inc/accounts_sql.inc.php b/admin/inc/accounts_sql.inc.php
index af4d51ab5d..2bcd11b012 100755
--- a/admin/inc/accounts_sql.inc.php
+++ b/admin/inc/accounts_sql.inc.php
@@ -116,6 +116,8 @@
      if ($account_info["old_loginid"] != $account_info["loginid"]) {
         $phpgw->db->query("update accounts set account_lid='" . $account_info["loginid"]
                         . "' where account_lid='" . $account_info["old_loginid"] . "'");
+        $phpgw->db->query("update phpgw_sessions set session_lid='" . $account_info["loginid"]
+                        . "' where session_lid='" . $account_info["old_loginid"] . "'");
 
 //        $account_info["loginid"] = $account_info["n_loginid"];
      }
@@ -125,7 +127,7 @@
 		               . "account_lastpwd_change='" . time() . "' where account_lid='"
 		               . $account_info["loginid"] . "'");
         $phpgw->db->query("update phpgw_sessions set session_pwd='" . addslashes($account_info["passwd"])
-                        . "' where session_lid='" . $lid . "'");
+                        . "' where session_lid='" . $account_info["loginid"] . "'");
       }
 
       while ($permission = each($account_info["permissions"])) {
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 4a61fb29e0..c72b2856db 100755
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -35,6 +35,7 @@
         - Merged in patch for Danish translation
           Thanks again zaphod
         - Fixed birthday reminders not showing up
+	- Fixed changing of users password through admin.
 
 [0.9.7] - Fixed SQL error in tts
         - Fixed table locking in admin -> edit account