From 65fed1486b5561ed1e76d64b838f27c1154e9f50 Mon Sep 17 00:00:00 2001
From: Sandro Cazzaniga <cazzaniga.sandro@gmail.com>
Date: Thu, 16 Aug 2012 07:26:53 +0000
Subject: [PATCH]     * [LEMONLDAP-504] Fix a regression introduced by
 LEMONLDAP-413

---
 lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_LDAP.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_LDAP.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_LDAP.pm
index 968a2a316..416aec010 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_LDAP.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_LDAP.pm
@@ -259,7 +259,9 @@ sub userModifyPassword {
             return PE_BADOLDPASSWORD if ( $mesg->code == 53 );
         }
         else {
-            if ( $self->{portal}->{portalRequireOldPassword} ) {
+            if ( $self->{portal}->{portalRequireOldPassword} 
+	        and !$self->{portal}->{mail_token} ) 
+	    {
 
                 return PE_MUST_SUPPLY_OLD_PASSWORD if ( !$oldpassword );