Index: trunk/core/kernel/utility/formatters/password_formatter.php
===================================================================
diff -u -r4758 -r6428
--- trunk/core/kernel/utility/formatters/password_formatter.php	(.../password_formatter.php)	(revision 4758)
+++ trunk/core/kernel/utility/formatters/password_formatter.php	(.../password_formatter.php)	(revision 6428)
@@ -59,6 +59,7 @@
 			{
 				if( $object->GetDBField($password_field) != $this->EncryptPassword('') )
 				{
+					if ($options['encryption_method'] == 'plain') return $value;
 					return $this->EncryptPassword($value);
 				}
 				else
@@ -87,11 +88,14 @@
 			}
 		}
 		if($value == '') return $object->GetDBField($field_name);
+
+		if ($options['encryption_method'] == 'plain') return $value;
 		return $this->EncryptPassword($value);
 	}
 
-	function EncryptPassword($value)
+	function EncryptPassword($value, $salt=null)
 	{
-		return md5($value);
+		if (!isset($salt)) return md5($value);
+		return md5(md5($value).$salt);
 	}
 }
\ No newline at end of file