Index: branches/unlabeled/unlabeled-1.1.2/core/kernel/utility/formatters/password_formatter.php
===================================================================
diff -u -r6348 -r6352
--- branches/unlabeled/unlabeled-1.1.2/core/kernel/utility/formatters/password_formatter.php	(.../password_formatter.php)	(revision 6348)
+++ branches/unlabeled/unlabeled-1.1.2/core/kernel/utility/formatters/password_formatter.php	(.../password_formatter.php)	(revision 6352)
@@ -59,6 +59,7 @@
 			{
 				if( $object->GetDBField($password_field) != $this->EncryptPassword('') )
 				{
+					if ($options['encryption_method'] == 'plain') return $value;
 					return $this->EncryptPassword($value);
 				}
 				else
@@ -87,6 +88,8 @@
 			}
 		}
 		if($value == '') return $object->GetDBField($field_name);
+
+		if ($options['encryption_method'] == 'plain') return $value;
 		return $this->EncryptPassword($value);
 	}