--- a/modules/user/user.module	Tue Dec 23 14:32:55 2008 +0100
+++ b/modules/user/user.module	Thu Jan 15 10:15:56 2009 +0100
@@ -1,5 +1,5 @@
 <?php
-// $Id: user.module,v 1.892.2.9 2008/11/05 14:13:03 dries Exp $
+// $Id: user.module,v 1.892.2.11 2009/01/14 23:34:08 goba Exp $
 
 /**
  * @file
@@ -270,7 +270,9 @@
     // the current one.
     if (!empty($array['pass'])) {
       sess_destroy_uid($account->uid);
-      sess_regenerate();
+      if ($account->uid == $GLOBALS['user']->uid) {
+        sess_regenerate();
+      }
     }
 
     // Refresh user object.
@@ -1532,6 +1534,7 @@
       $form['picture']['picture_delete'] = array('#type' => 'hidden');
     }
     $form['picture']['picture_upload'] = array('#type' => 'file', '#title' => t('Upload picture'), '#size' => 48, '#description' => t('Your virtual face or picture. Maximum dimensions are %dimensions and the maximum size is %size kB.', array('%dimensions' => variable_get('user_picture_dimensions', '85x85'), '%size' => variable_get('user_picture_file_size', '30'))) .' '. variable_get('user_picture_guidelines', ''));
+    $form['#validate'][] = 'user_profile_form_validate';
     $form['#validate'][] = 'user_validate_picture';
   }
   $form['#uid'] = $uid;