remove space entered after text replacement?

i set up text replacement for my email address. The problem is that when I do this at a login screen, or filling out a form, when I hit return I need to go back and delete the extra space that is automatically created after the address. If I do not do this then the login screen uses the space as a part of my email address & doesn't take it. Any ideas on how to "fix" this?