Index: branches/unlabeled/unlabeled-1.2.8/core/kernel/utility/formatters/password_formatter.php
===================================================================
diff -u -r6918 -r6923
--- branches/unlabeled/unlabeled-1.2.8/core/kernel/utility/formatters/password_formatter.php	(.../password_formatter.php)	(revision 6918)
+++ branches/unlabeled/unlabeled-1.2.8/core/kernel/utility/formatters/password_formatter.php	(.../password_formatter.php)	(revision 6923)
@@ -10,10 +10,13 @@
 		if( isset( $field_options['verify_field'] ) )
 		{
 			$add_fields = Array();
-			$options = Array('master_field' => $field_name, 'formatter'=>'kPasswordFormatter');
+			$options = Array('master_field' => $field_name, 'formatter' => 'kPasswordFormatter');
 			if (isset($field_options['encryption_method'])) {
 				$options['encryption_method'] = $field_options['encryption_method'];
 			}
+			if (isset($field_options['salt'])) {
+				$options['salt'] = $field_options['salt'];
+			}
 			$add_fields[ $field_options['verify_field'] ] = $options;
 
 			$add_fields[$field_name.'_plain'] = Array('type'=>'string', 'error_field'=>$field_name);
@@ -52,10 +55,10 @@
 			$fields = array_reverse($fields);
 			$flip_count++;
 		}
-
+		
+		$salt = isset($object->Fields[$password_field]['salt']) ? $object->Fields[$password_field]['salt'] : '';
 		if( getArrayValue($object->Fields[$password_field], 'verify_field_set') && getArrayValue($object->Fields[$verify_field], 'master_field_set') )
 		{
-			$salt = isset($object->Fields[$password_field]['salt']) ? $object->Fields[$password_field]['salt'] : '';
 			$new_password = $object->GetDBField($password_field.'_plain');
 			$verify_password = $object->GetDBField($verify_field.'_plain');