Users Plugin - Email Templates - Updates #2