Removing extra parameters from the links in Emails, refs #1486