diff --git a/inc/PassHash.class.php b/inc/PassHash.class.php
index c13cf4a54a3bad5ddc57c3160c4820af42960630..8f62425aa92573c101e0f53930f9d5ceb9fdaee0 100644
--- a/inc/PassHash.class.php
+++ b/inc/PassHash.class.php
@@ -51,7 +51,7 @@ class PassHash {
             $method = 'ssha';
             $salt   = substr(base64_decode(substr($hash, 6)),20);
         }elseif(substr($hash,0,6) == '{SMD5}'){
-            $method = 'smd6';
+            $method = 'lsmd5';
             $salt   = substr(base64_decode(substr($hash, 6)),16);
         }elseif($len == 32){
             $method = 'md5';
@@ -135,13 +135,15 @@ class PassHash {
 
 
     /**
-     * Password hashing method 'smd6'
+     * Password hashing method 'lsmd5'
      *
-     * Uses salted MD5 hashs. Salt is 8 bytes long. Yes, really 8 bytes...
+     * Uses salted MD5 hashs. Salt is 8 bytes long.
+     *
+     * This is the format used by LDAP.
      */
-    public function hash_smd6($clear, $salt=null){
-      $this->init_salt($salt,8);
-      return "{SMD5}".base64_encode(md5($clear.$salt, true).$salt);
+    public function hash_lsmd5($clear, $salt=null){
+        $this->init_salt($salt,8);
+        return "{SMD5}".base64_encode(md5($clear.$salt, true).$salt);
     }
 
 
diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php
index c943a2fadd81fd8688be007a5b76edf7e890f16d..0315ecae65609af9a518714ca9b23bb84a2c20e9 100644
--- a/lib/plugins/config/settings/config.metadata.php
+++ b/lib/plugins/config/settings/config.metadata.php
@@ -123,7 +123,7 @@ $meta['_authentication'] = array('fieldset');
 $meta['useacl']      = array('onoff');
 $meta['autopasswd']  = array('onoff');
 $meta['authtype']    = array('authtype');
-$meta['passcrypt']   = array('multichoice','_choices' => array('smd5','smd6','md5','apr1','sha1','ssha','crypt','mysql','my411','kmd5','pmd5','hmd5'));
+$meta['passcrypt']   = array('multichoice','_choices' => array('smd5','md5','apr1','sha1','ssha','lsmd5','crypt','mysql','my411','kmd5','pmd5','hmd5'));
 $meta['defaultgroup']= array('string');
 $meta['superuser']   = array('string');
 $meta['manager']     = array('string');