diff --git a/inc/common.php b/inc/common.php
index dbd2ed4519b186141fb935404c23d12c07286e41..7e0ecf625208a49654465fdcc6da11276d2276a7 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -94,11 +94,11 @@ function pageinfo(){
  *
  * @author Andreas Gohr
  */
-function buildURLparams($params){
+function buildURLparams($params, $sep='&'){
   $url = '';
   $amp = false;
   foreach($params as $key => $val){
-    if($amp) $url .= '&';
+    if($amp) $url .= $sep;
 
     $url .= $key.'=';
     $url .= rawurlencode($val);
@@ -247,12 +247,12 @@ function idfilter($id,$ue=true){
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  */
-function wl($id='',$more='',$abs=false){
+function wl($id='',$more='',$abs=false,$sep='&amp;'){
   global $conf;
   if(is_array($more)){
-    $more = buildURLparams($more);
+    $more = buildURLparams($more,$sep);
   }else{
-    $more = str_replace(',','&amp;',$more);
+    $more = str_replace(',',$sep,$more);
   }
 
   $id    = idfilter($id);
@@ -270,7 +270,7 @@ function wl($id='',$more='',$abs=false){
     if($more) $xlink .= '?'.$more;
   }else{
     $xlink .= DOKU_SCRIPT.'?id='.$id;
-    if($more) $xlink .= '&amp;'.$more;
+    if($more) $xlink .= $sep.$more;
   }
   
   return $xlink;
@@ -281,12 +281,12 @@ function wl($id='',$more='',$abs=false){
  *
  * Will return a link to the detail page if $direct is false
  */
-function ml($id='',$more='',$direct=true){
+function ml($id='',$more='',$direct=true,$sep='&amp;'){
   global $conf;
   if(is_array($more)){
-    $more = buildURLparams($more);
+    $more = buildURLparams($more,$sep);
   }else{
-    $more = str_replace(',','&amp;',$more);
+    $more = str_replace(',',$sep,$more);
   }
 
   $xlink = DOKU_BASE;
@@ -296,7 +296,7 @@ function ml($id='',$more='',$direct=true){
     $xlink .= 'lib/exe/fetch.php';
     if($more){
       $xlink .= '?'.$more;
-      $xlink .= '&amp;media='.rawurlencode($id);
+      $xlink .= $sep.'media='.rawurlencode($id);
     }else{
       $xlink .= '?media='.rawurlencode($id);
     }
@@ -327,7 +327,7 @@ function ml($id='',$more='',$direct=true){
    }else{
      if($more){
        $xlink .= $script.'?'.$more;
-       $xlink .= '&amp;media='.$id;
+       $xlink .= $sep.'media='.$id;
      }else{
        $xlink .= $script.'?media='.$id;
      }
diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php
index bd579423b50940da74c02e807019c1d244a58d11..5f628e687022f74876c22dc254896cdde9592790 100644
--- a/lib/plugins/config/admin.php
+++ b/lib/plugins/config/admin.php
@@ -79,7 +79,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
         // save state & force a page reload to get the new settings to take effect
         $_SESSION['PLUGIN_CONFIG'] = array('state' => 'updated', 'time' => time());
         $this->_close_session();
-        header("Location: ".str_replace('&amp;','&',wl($ID,'do=admin&page=config')));
+        header("Location: ".wl($ID,array('do'=>'admin','page'=>'config'),true,'&'));
         exit();
       }
       
diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php
index 736e4f048ee50e8c6775e513c3f28a5c4af94abb..c79c093816f2fa03e0edfbe42f99180888fb0e4e 100644
--- a/lib/plugins/config/lang/en/lang.php
+++ b/lib/plugins/config/lang/en/lang.php
@@ -54,6 +54,7 @@ $lang['mailguard']   = 'obfuscate email addresses';  //obfuscate email addresses
 $lang['useacl']      = 'use ACL';                //Use Access Control Lists to restrict access?
 $lang['openregister']= 'open register';          //Should users to be allowed to register?
 $lang['autopasswd']  = 'autogenerate passwords'; //autogenerate passwords and email them to user
+$lang['resendpasswd']= 'allow resend password';  //allow resend password function?
 $lang['authtype']    = 'authentication backend'; //which authentication backend should be used
 $lang['passcrypt']   = 'password encryption';    //Used crypt method (smd5,md5,sha1,ssha,crypt,mysql,my411)
 $lang['defaultgroup']= 'default group';          //Default groups new Users are added to
diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php
index c69bb8f36e8a86628950bd2b71e95c518d93164c..48ce2db6a8ba67c011f53c81b147af9116a0b704 100644
--- a/lib/plugins/config/settings/config.metadata.php
+++ b/lib/plugins/config/settings/config.metadata.php
@@ -103,6 +103,7 @@ $meta['mailguard']   = array('multichoice','_choices' => array('visible','hex','
 $meta['useacl']      = array('onoff');
 $meta['openregister']= array('onoff');
 $meta['autopasswd']  = array('onoff');
+$meta['resendpasswd'] = array('onoff');
 $meta['authtype']    = array('authtype');
 $meta['passcrypt']   = array('multichoice','_choices' => array('smd5','md5','sha1','ssha','crypt','mysql','my411'));
 $meta['defaultgroup']= array('');