diff --git a/ChangeLog b/ChangeLog
index 42b4adec6..263d4092a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2007-07-22  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/PreferencesUI/UIxPreferences.m ([UIxPreferences
+	+initialize]): scan the value of SOGoUIxUserCanChangePassword.
+	Default is "no".
+	([UIxPreferences -shouldDisplayPasswordChange]): new template
+	method that returns the value of SOGoUIxUserCanChangePassword.
+
 	* UI/MainUI/SOGoUserHomePage.m ([SOGoUserHomePage +initialize]):
 	scan the value of SOGoUIxDefaultModule. If not set, the default
 	module defaults to "Calendar".
diff --git a/NEWS b/NEWS
index a66b84408..78712a375 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@
 --------------
 - added the ability to choose the default module from the
   application settings: "Calendars", "Contacts" or "Mail";
+- added the ability to show or hide the password change dialog from the
+  application settings;
 
 0.9.0-20070713
 --------------
diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index 2c8c486b8..5799e82dc 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -40,8 +40,19 @@
    workweek = from -> to
    identities */
 
+static BOOL shouldDisplayPasswordChange = NO;
+
 @implementation UIxPreferences
 
++ (void) initialize
+{
+  NSUserDefaults *ud;
+
+  ud = [NSUserDefaults standardUserDefaults];
+  shouldDisplayPasswordChange
+    = [ud boolForKey: @"SOGoUIxUserCanChangePassword"];
+}
+
 - (id) init
 {
   NSDictionary *locale;
@@ -426,4 +437,9 @@
   return [[request method] isEqualToString: @"POST"];
 }
 
+- (BOOL) shouldDisplayPasswordChange
+{
+  return shouldDisplayPasswordChange;
+}
+
 @end
diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index 223c86b7f..6d97ce4a3 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -19,7 +19,9 @@
 	    label:value="Date and Time"/></li>
 	<li target="calendarOptionsView"><var:string
 	    label:value="Calendar Options"/></li>
-	<li target="passwordView"><var:string label:value="Password"/></li>
+	<var:if condition="shouldDisplayPasswordChange">
+	  <li target="passwordView"><var:string label:value="Password"/></li>
+	</var:if>
       </ul>
       <div id="outOfOfficeView" class="tab">
 	<label><input
@@ -87,18 +89,20 @@
 	  <var:popup list="reminderTimesList" item="item"
 	    string="itemReminderTimeText" selection="userReminderTime"/></label>
       </div>
-      <div id="passwordView" class="tab">
-	<label><var:string label:value="New password:"
-	    /><input type="text" class="textField"
-	    const:enabled="disabled"
-	    var:value="newPassword"/></label><br/>
-	<label><var:string label:value="Confirmation:"
-	    /><input type="text" class="textField"
-	    const:enabled="disabled"
-	    var:value="newPasswordConfirmation"/></label><br/>
-	<input type="button" class="button"
-	  id="changePasswordBtn" label:value="Change"/>
-      </div>
+      <var:if condition="shouldDisplayPasswordChange">
+	<div id="passwordView" class="tab">
+	  <label><var:string label:value="New password:"
+	      /><input type="text" class="textField"
+	      const:enabled="disabled"
+	      var:value="newPassword"/></label><br/>
+	  <label><var:string label:value="Confirmation:"
+	      /><input type="text" class="textField"
+	      const:enabled="disabled"
+	      var:value="newPasswordConfirmation"/></label><br/>
+	  <input type="button" class="button"
+	    id="changePasswordBtn" label:value="Change"/>
+	</div>
+      </var:if>
     </div>
   </form>
 </var:component>