Fix email templates working like before in new user profile