Current user role Login URL using labels

When a user is logging in the special redirect is still using the default internal s2member user role instead of the given labels? I have it checked to force wordpress to use the custom labels. The %%current_user_role%% replacement code still uses the default s2member level names instead of it’s given label. Is there a way to use the custom label instead of the internal s2member labels for the replacement code %%current_user_role%%.