LDAP Role Lookup Not Working Properly

Issue

It looks like we are haveing an issue with the ldap-auth-module.xml. We are failing to get the roles for certain/most users. Below is an example of what is going on:

Example User 1: Fails
userid: user1
CN: User, One X.
DN: CN=User\, One,OU=Users,OU=Area1,DC=Area2,DC=net

Example User 2: Works
userid: user2
CN: user2
DN: CN=user2,OU=Users,OU=Area1,DC=Area2,DC=net

So in the ldap-auth-module.xml we have the following in role.filter:
role.filter=(member=cn=%u,ou=USERS,ou=Area1,dc=Area2,dc=net)

As you can see from the two examples above the userID (%u) is not always the userID in the DN inside our Ldap.

Is there a way to get the information returned from the user.filter to be used in the role.filter? Or a different way to get the cn from our Ldap?