diff --git a/html/class_passwordRecovery.inc b/html/class_passwordRecovery.inc
index 49c79efe5f1b5137f58277730d45edb0392aff2c..eb71ad2e2e3c859ae0027ada28097a740aee0313 100644
--- a/html/class_passwordRecovery.inc
+++ b/html/class_passwordRecovery.inc
@@ -374,7 +374,7 @@ class passwordRecovery extends standAlonePage {
     $ldap = $config->get_ldap_link();
 
     // Check if token branch is here
-    $token = get_ou('tokenRDN').get_ou('fusiondirectoryRDN').$config->current['BASE'];
+    $token = get_ou('recoveryTokenRDN').get_ou('fusiondirectoryRDN').$config->current['BASE'];
     $ldap->cat($token, array('dn'));
     if (!$ldap->count()) {
       /* It's not, let's create it */
@@ -421,7 +421,7 @@ class passwordRecovery extends standAlonePage {
     /* Retrieve hash from the ldap */
     $ldap = $config->get_ldap_link();
 
-    $token  = get_ou('tokenRDN').get_ou('fusiondirectoryRDN').$config->current['BASE'];
+    $token  = get_ou('recoveryTokenRDN').get_ou('fusiondirectoryRDN').$config->current['BASE'];
     $dn     = "ou=".$this->uid.",$token";
     $ldap->cat($dn);
     $attrs = $ldap->fetch();
diff --git a/include/functions.inc b/include/functions.inc
index 71226dc638f147435a0132dcc5db9c86e9c52502..c4754566541486f7ab58c15647fb5f5c539290ce 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -1286,8 +1286,8 @@ function get_ou($name)
   $map = array(
     'fusiondirectoryRDN'      => 'ou=fusiondirectory,',
     'lockRDN'                 => 'ou=locks,',
-    'tokenRDN'                => 'ou=tokens,',
-    'fdReminderTokenRDN'      => 'ou=reminder,',
+    'recoveryTokenRDN'        => 'ou=recovery,',
+    'reminderTokenRDN'        => 'ou=reminder,',
     'roleRDN'                 => 'ou=roles,',
     'ogroupRDN'               => 'ou=groups,',
     'applicationRDN'          => 'ou=apps,',
diff --git a/plugins/config/class_recoveryConfig.inc b/plugins/config/class_recoveryConfig.inc
index 521ce81049f013ed8d5305f331b8bfece7e8ba1d..7ab146a12100e77f894b553818cfda9e60a997cc 100644
--- a/plugins/config/class_recoveryConfig.inc
+++ b/plugins/config/class_recoveryConfig.inc
@@ -122,7 +122,7 @@ class recoveryConfig extends simplePlugin
     global $config;
     // Check if token branch is here
     $ldap = $config->get_ldap_link();
-    $tokenBranch = get_ou('tokenRDN').get_ou('fusiondirectoryRDN').$config->current['BASE'];
+    $tokenBranch = get_ou('recoveryTokenRDN').get_ou('fusiondirectoryRDN').$config->current['BASE'];
     $ldap->cat($tokenBranch, array('dn'));
     if (!$ldap->count()) {
       $ldap->cd($config->current['BASE']);