diff -r a836b0b9193e sites/all/modules/salt/salt.module
--- a/sites/all/modules/salt/salt.module	Wed Mar 10 13:10:01 2010 -0500
+++ b/sites/all/modules/salt/salt.module	Wed Mar 10 16:23:36 2010 -0500
@@ -43,16 +43,16 @@ function salt_form_alter(&$form, $form_s
  */
 function salt_login_validate($form, &$form_state) {
   $form_state['values']['pass'] = trim($form_state['values']['pass']);
 
   if (strlen($form_state['values']['pass'])) {
     $salted_pass = $form_state['values']['pass'] . variable_get('salt', '');
 
     // The user_profile_form is structured differently to the login forms.
-    if($form_state['values']['form_id'] == 'user_profile_form') {
+    if(isset($form['account']['pass']) && !empty($form['account']['pass'])) {
       form_set_value($form['account']['pass'], $salted_pass, $form_state);
     }
     else {
       form_set_value($form['pass'], $salted_pass, $form_state);
     }
   }
 }