diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl
index 7f79dd2cb9..93e07036b0 100755
--- a/admin/systempreferences.pl
+++ b/admin/systempreferences.pl
@@ -81,6 +81,8 @@ $tabsysprefs{itemcallnumber}="Catalogue";
 $tabsysprefs{maxreserves}="Circulation";
 $tabsysprefs{virtualshelves}="OPAC";
 $tabsysprefs{hide_marc}="Catalogue";
+$tabsysprefs{NotifyBorrowerDeparture}="Members";
+$tabsysprefs{OpacPasswordChange}="OPAC";
 
 sub StringSearch  {
 	my ($env,$searchstring,$type)=@_;
diff --git a/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl
index d201ce607c..acf9259b82 100644
--- a/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl
+++ b/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl
@@ -11,7 +11,9 @@
 		<p><!-- TMPL_IF name="faxnumber" -->Fax: <!-- TMPL_VAR NAME="faxnumber" --><!-- /TMPL_IF --></p>
 		<p><!-- TMPL_VAR NAME="emailaddress" --></p>
 		<p><a href="/cgi-bin/koha/opac-userupdate.pl" class="button">Update Record</a></p>
-		<p><a href="/cgi-bin/koha/opac-passwd.pl" class="button">Change your password</a></p>
+		<!-- TMPL_IF name="OpacPasswordChange" -->
+			<p><a href="/cgi-bin/koha/opac-passwd.pl" class="button">Change your password</a></p>
+		<!-- /TMPL_IF -->
 		<!-- TMPL_IF name="textmessaging"-->
 			<h2>Message from the library</h2>
 			<!-- TMPL_VAR name="textmessaging" -->
diff --git a/opac/opac-user.pl b/opac/opac-user.pl
index 1c70de4cb9..e4e65390ab 100755
--- a/opac/opac-user.pl
+++ b/opac/opac-user.pl
@@ -143,6 +143,7 @@ $template->param(waiting_count => $wcount,
 				LibraryName => C4::Context->preference("LibraryName"),
 				suggestion => C4::Context->preference("suggestion"),
 				virtualshelves => C4::Context->preference("virtualshelves"),
+				OpacPasswordChange => C4::Context->preference("OpacPasswordChange"),
 				textmessaging => $borr->{textmessaging},
 );
 
diff --git a/updater/updatedatabase b/updater/updatedatabase
index 0fe7c7f86b..a996f4bb09 100755
--- a/updater/updatedatabase
+++ b/updater/updatedatabase
@@ -933,6 +933,15 @@ my %tabledata = (
             explanation         => 'Delay before expiry where a notice is sent when issuing',
             type                => 'Integer',
         },
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'OpacPasswordChange',
+            value               => '1',
+            forceupdate         => { 'explanation' => 1,
+                                     'type' => 1},
+            explanation         => 'Enable/Disable password change in OPAC (disable it when using LDAP auth)',
+            type                => 'YesNo',
+        },
     ],
 
 );
@@ -1529,6 +1538,9 @@ $sth->finish;
 exit;
 
 # $Log$
+# Revision 1.100.2.15  2005/12/05 09:50:35  tipaul
+# New systempreference : OpacPasswordChange if set to Yes (default) the user can change it's password. If set to No, he can't. Useful for libraries with LDAP auth, where the password is checked in LDAP, not in Koha, thus Koha can't change it
+#
 # Revision 1.100.2.14  2005/12/05 09:41:35  tipaul
 # typo fix : NofifyBorrowerDeparture instead of NotifiyBorrowerDeparture
 #