#6 % don't substitute by user if the user name isn't like email

[mens liber]

For our application we consider that if it isn't like email it must be the user name.

Added the patch in the attachment.

Thanks.

[mens liber]

Patch to add the funcionality