diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 7616443984..c680b05579 100755
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -3,6 +3,7 @@
 		   you where in.
 		 - You can now use decimals in the inventory program.
 		 - Added missing tables for tts and fixed problems with postgresql.
+		 - Fixed changing of password not getting set in session table
 
 [09072000] - Added print icon that allows you to print out a page without having
 	        the navbar. Thanks Sam Wynn Jr <sam.wynn@lmco.com>
diff --git a/preferences/changepassword.php b/preferences/changepassword.php
index c0a450227a..e0b3d49c82 100755
--- a/preferences/changepassword.php
+++ b/preferences/changepassword.php
@@ -76,7 +76,7 @@ if (! $submit) {
 
    // Since they are logged in, we need to change the password in sessions
    // in case they decied to check there mail.
-   $phpgw->db->query("update sessions set passwd='" . addslashes($n_passwd)
+   $phpgw->db->query("update sessions set passwd='" . $phpgw->common->encrypt($n_passwd)
 	          . "' where loginid='" . $phpgw_info["user"]["userid"] . "'");
 
    Header("Location: " . $phpgw->link($phpgw_info["server"]["webserver_url"]