Index: plugins/UsersManager/Controller.php
===================================================================
--- plugins/UsersManager/Controller.php	(revision 3191)
+++ plugins/UsersManager/Controller.php	(working copy)
@@ -126,6 +126,7 @@
 		$view->piwikHost = Piwik_Url::getCurrentHost();
 		$this->setBasicVariablesView($view);
 		$view->menu = Piwik_GetAdminMenu();
+                $view->permitChangingUserPassword = Zend_Registry::get('config')->General->permit_changing_user_password;
 		echo $view->render();
 	}
 	
@@ -280,8 +281,10 @@
     				Zend_Registry::get('config')->superuser = $superUser->toArray();
     			}
     		}
-    		else
-    		{
+    		else {
+                        if (!Zend_Registry::get('config')->General->permit_changing_user_password) {
+                            $newPassword = false;
+                        }
     			Piwik_UsersManager_API::getInstance()->updateUser($userLogin, $newPassword, $email, $alias);
     		}
     		
Index: plugins/UsersManager/templates/userSettings.tpl
===================================================================
--- plugins/UsersManager/templates/userSettings.tpl	(revision 3191)
+++ plugins/UsersManager/templates/userSettings.tpl	(working copy)
@@ -53,7 +53,7 @@
 	</fieldset>
 	</td>
 </tr>
-
+{if $permitChangingUserPassword || $isSuperUser }
 <tr>
 	<td><label for="email">{'UsersManager_ChangePassword'|translate} </label></td>
 	<td><input size="25" value="" autocomplete="off" id="password" type="password" />
@@ -62,6 +62,7 @@
 	 <span class='form-description'> {'UsersManager_TypeYourPasswordAgain'|translate}</span>
 	 </td>
 </tr>
+{/if}
 </table>
 
 {ajaxErrorDiv id=ajaxErrorUserSettings}
Index: config/global.ini.php
===================================================================
--- config/global.ini.php	(revision 3191)
+++ config/global.ini.php	(working copy)
@@ -178,6 +178,8 @@
 ; subscribeNewsletter.
 api_service_url = http://api.piwik.org
 
+; If set to 1, users are permitted to change their password
+permit_changing_user_password = 1
 
 [Tracker]
 ; set to 0 if you want to stop tracking the visitors. Useful if you need to stop all the connections on the DB.