diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php
index 8655bd32d8f4c01fe39f05c416d9573648d4fd75..9b027ea7fd5b94bb3ea7f74b4203e3bef7133bf2 100644
--- a/conf/dokuwiki.php
+++ b/conf/dokuwiki.php
@@ -54,6 +54,7 @@ $conf['mailguard']   = 'hex';             //obfuscate email addresses against sp
 $conf['useacl']      = 0;                //Use Access Control Lists to restrict access?
 $conf['openregister']= 1;                //Should users to be allowed to register?
 $conf['autopasswd']  = 1;                //autogenerate passwords and email them to user
+$conf['resendpasswd']= 0;                //allow resend password function?
 $conf['authtype']    = 'plain';          //which authentication backend should be used
 $conf['passcrypt']   = 'smd5';           //Used crypt method (smd5,md5,sha1,ssha,crypt,mysql,my411)
 $conf['defaultgroup']= 'user';           //Default groups new Users are added to
diff --git a/inc/auth.php b/inc/auth.php
index ddc4007cf02044701064de412d707091dfe22dae..7ae0da1a41ec92d3d23938716ce56cb77cdfa4f2 100644
--- a/inc/auth.php
+++ b/inc/auth.php
@@ -541,6 +541,7 @@ function act_resendpwd(){
 		global $auth;
     
     if(!$_POST['save']) return false;
+    if(!$conf['resendpasswd']) return false;
 
     // should not be able to get here without modifyUser being possible...
 	if(!$auth->canDo('modifyUser')) {
diff --git a/inc/html.php b/inc/html.php
index 9b12ddbd111543fbc39e7e1a70c73e9a986e3f05..e53dcbaf61a3023275a84ca7f61f6fb7d660d1cf 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -80,7 +80,7 @@ function html_login(){
       print '</p>';
     }
 
-    if ($auth->canDo('modifyUser')) {
+    if ($auth->canDo('modifyUser') && $conf['resendpasswd']) {
       print '<p>';
       print $lang['pwdforget'];
       print ': <a href="'.wl($ID,'do=resendpwd').'" class="wikilink1">'.$lang['btn_resendpwd'].'</a>';