Fix(email-templates): Autosave and Email Template Variables Mapping

Issue addressed #1444 (closed) There were some testing-related bugs shared on the issue comments. The fixes are implemented in this merge request.