diff -urp salt/salt.module salt_mod/salt.module
--- salt.module	2008-03-29 22:57:44.000000000 +0100
+++ salt.module	2008-10-28 17:51:28.000000000 +0100
@@ -17,8 +17,8 @@ function salt_menu() {
   $items = array();
 
   $items['admin/settings/salt'] = array(
-    'title' => t('Salt'),
-    'description' => t('Set the salt string.'),
+    'title' => 'Salt',
+    'description' => 'Set the salt string.',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('salt_settings_form'),
     'access arguments' => array('administer site configuration'),
@@ -29,7 +29,7 @@ function salt_menu() {
 }
 
 /**
- * Implementation of hook_form_alter.
+ * Implementation of hook_form_alter().
  */
 function salt_form_alter(&$form, $form_state, $form_id) {
   if (in_array($form_id, array('user_login_block', 'user_login', 'user_profile_form', 'user_register'))) {
@@ -48,8 +48,13 @@ function salt_login_validate($form, &$fo
     $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') {
-      form_set_value($form['account']['pass'], $salted_pass, $form_state);
+    if ($form_state['values']['form_id'] == 'user_profile_form' || $form_state['values']['form_id'] == 'user_register' ) {
+      if(arg(0) == "admin" && $form_state['values']['form_id'] == 'user_register') {
+        // This get's salted when the user is saved.
+      }
+      else {
+        form_set_value($form['account']['pass'], $salted_pass, $form_state);
+      }
     }
     else {
       form_set_value($form['pass'], $salted_pass, $form_state);