diff --git a/auth/ldap/lib.php b/auth/ldap/lib.php
index 1ba88dc..a9b4dca 100644
--- a/auth/ldap/lib.php
+++ b/auth/ldap/lib.php
@@ -1058,8 +1058,8 @@ function auth_ldap_suppported_usertypes (){
 function auth_ldap_getdefaults(){
     $default['ldap_objectclass'] = array(
                         'edir' => 'User',
-                        'rfc2703' => 'posixAccount',
-                        'rfc2703bis' => 'posixAccount',
+                        'rfc2307' => 'posixAccount',
+                        'rfc2307bis' => 'posixAccount',
                         'samba' => 'sambaSamAccount',
                         'ad' => 'user',
                         'default' => '*'
@@ -1110,8 +1110,8 @@ function auth_ldap_getbinaryfields () {
     global $CFG;
     $binaryfields = array (
                         'edir' => array('guid'),
-                        'rfc2703' => array(),
-                        'rfc2703bis' => array(),
+                        'rfc2307' => array(),
+                        'rfc2307bis' => array(),
                         'samba' => array(),
                         'ad' => array(),
                         'default' => '*'
@@ -1192,7 +1192,8 @@ function auth_ldap_expirationtime2unix ($time) {
             $sec=substr($time,12,2);
             $result = mktime($hr,$min,$sec,$mo,$dt,$yr); 
             break;
-        case 'posix':
+        case 'rfc2307':
+        case 'rfc2307bis':
             $result = $time * DAYSECS ; //The shadowExpire contains the number of DAYS between 01/01/1970 and the actual expiration date
             break;
         default:  
@@ -1213,7 +1214,8 @@ function auth_ldap_unix2expirationtime ($time) {
         case 'edir':
             $result=date('YmdHis', $time).'Z';  
             break;
-        case 'posix':
+        case 'rfc2307':
+        case 'rfc2307bis':
             $result = $time ; //Already in correct format
             break;
         default: