diff --git a/src/lib/actions/analytics.ts b/src/lib/actions/analytics.ts
index 49b8fdada..11f965d00 100644
--- a/src/lib/actions/analytics.ts
+++ b/src/lib/actions/analytics.ts
@@ -221,5 +221,16 @@ export enum Submit {
     BucketUpdateExtensions = 'submit_bucket_update_extensions',
     FileCreate = 'submit_file_create',
     FileDelete = 'submit_file_delete',
-    FileUpdatePermissions = 'submit_file_update_permissions'
+    FileUpdatePermissions = 'submit_file_update_permissions',
+    EmailChangeLocale = 'submit_email_change_locale',
+    EmailResetTemplate = 'submit_email_reset_template',
+    EmailUpdateInviteTemplate = 'submit_email_update_invite_template',
+    EmailUpdateMagicUrlTemplate = 'submit_email_update_magic_url_template',
+    EmailUpdateRecoveryTemplate = 'submit_email_update_recovery_template',
+    EmailUpdateVerificationTemplate = 'submit_email_update_verification_template',
+    SmsChangeLocale = 'submit_sms_change_locale',
+    SmsResetTemplate = 'submit_sms_reset_template',
+    SmsUpdateInviteTemplate = 'submit_sms_update_invite_template',
+    SmsUpdateLoginTemplate = 'submit_sms_update_login_template',
+    SmsUpdateVerificationTemplate = 'submit_sms_update_verification_template'
 }
diff --git a/src/routes/console/project-[project]/auth/templates/+page.svelte b/src/routes/console/project-[project]/auth/templates/+page.svelte
index 2e8ff0eb2..61a5de7ef 100644
--- a/src/routes/console/project-[project]/auth/templates/+page.svelte
+++ b/src/routes/console/project-[project]/auth/templates/+page.svelte
@@ -38,7 +38,7 @@
     import EmailInviteTemplate from './emailInviteTemplate.svelte';
     import SmsVerificationTemplate from './smsVerificationTemplate.svelte';
     import SmsLoginTemplate from './smsLoginTemplate.svelte';
-    import { baseEmailTemplate, baseSmsTemplate, emailTemplate, smsTemplate } from './strote';
+    import { baseEmailTemplate, baseSmsTemplate, emailTemplate, smsTemplate } from './store';
     import { Button } from '$lib/elements/forms';
 
     export let data: PageData;
@@ -91,7 +91,7 @@
                     {
                         name: 'Add SMTP server',
                         method: () => {
-                            goto(base + '/console/project-' + $project.$id + '/settings/smtp');
+                            goto(`${base}/console/project-${$project.$id}/settings/smtp`);
                         }
                     }
                 ]}>
@@ -165,7 +165,7 @@
             </Collapsible>
         </svelte:fragment>
         <svelte:fragment slot="actions">
-            <Button href={base + '/console/project-' + $project.$id + '/settings/smtp'} secondary>
+            <Button href={`${base}/console/project-${$project.$id}/settings/smtp`} secondary>
                 Add SMTP server
             </Button>
         </svelte:fragment>
diff --git a/src/routes/console/project-[project]/auth/templates/emailInviteTemplate.svelte b/src/routes/console/project-[project]/auth/templates/emailInviteTemplate.svelte
index 662cdaf4a..ece738a44 100644
--- a/src/routes/console/project-[project]/auth/templates/emailInviteTemplate.svelte
+++ b/src/routes/console/project-[project]/auth/templates/emailInviteTemplate.svelte
@@ -4,9 +4,10 @@
     import type { Models } from '@appwrite.io/console';
     import { loadEmailTemplate } from './+page.svelte';
     import { page } from '$app/stores';
-    import { baseEmailTemplate, emailTemplate } from './strote';
+    import { baseEmailTemplate, emailTemplate } from './store';
     import { addNotification } from '$lib/stores/notifications';
     import { Id } from '$lib/components';
+    import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
 
     export let localeCodes: Models.LocaleCode[];
 
@@ -20,16 +21,17 @@
         }, 1000);
         try {
             const template = await loadEmailTemplate(projectId, 'invitation', locale);
-            clearTimeout(timeout);
             emailTemplate.set(template);
             $baseEmailTemplate = { ...$emailTemplate };
+            trackEvent(Submit.EmailChangeLocale, { locale, type: 'invitation' });
         } catch (error) {
-            clearTimeout(timeout);
+            trackError(error, Submit.EmailChangeLocale);
             addNotification({
                 type: 'error',
                 message: error.message
             });
         } finally {
+            clearTimeout(timeout);
             loading = false;
         }
     }
diff --git a/src/routes/console/project-[project]/auth/templates/emailMagicUrlTemplate.svelte b/src/routes/console/project-[project]/auth/templates/emailMagicUrlTemplate.svelte
index 0ebbc6b89..0170381bb 100644
--- a/src/routes/console/project-[project]/auth/templates/emailMagicUrlTemplate.svelte
+++ b/src/routes/console/project-[project]/auth/templates/emailMagicUrlTemplate.svelte
@@ -3,10 +3,11 @@
     import EmailTemplate from './emailTemplate.svelte';
     import LocaleOptions from './localeOptions.svelte';
     import type { Models } from '@appwrite.io/console';
-    import { baseEmailTemplate, emailTemplate } from './strote';
+    import { baseEmailTemplate, emailTemplate } from './store';
     import { page } from '$app/stores';
     import { addNotification } from '$lib/stores/notifications';
     import { Id } from '$lib/components';
+    import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
 
     export let localeCodes: Models.LocaleCode[];
     const projectId = $page.params.project;
@@ -20,16 +21,18 @@
         }, 1000);
         try {
             const template = await loadEmailTemplate(projectId, 'magicSession', locale);
-            clearTimeout(timeout);
             emailTemplate.set(template);
             $baseEmailTemplate = { ...$emailTemplate };
+            trackEvent(Submit.EmailChangeLocale, { locale, type: 'magicSession' });
         } catch (error) {
-            clearTimeout(timeout);
+            trackError(error, Submit.EmailChangeLocale);
             addNotification({
                 type: 'error',
                 message: error.message
             });
         } finally {
+            clearTimeout(timeout);
+
             loading = false;
         }
     }
diff --git a/src/routes/console/project-[project]/auth/templates/emailRecoveryTemplate.svelte b/src/routes/console/project-[project]/auth/templates/emailRecoveryTemplate.svelte
index 1f49ad7d2..52300e899 100644
--- a/src/routes/console/project-[project]/auth/templates/emailRecoveryTemplate.svelte
+++ b/src/routes/console/project-[project]/auth/templates/emailRecoveryTemplate.svelte
@@ -2,11 +2,12 @@
     import EmailTemplate from './emailTemplate.svelte';
     import LocaleOptions from './localeOptions.svelte';
     import type { Models } from '@appwrite.io/console';
-    import { baseEmailTemplate, emailTemplate } from './strote';
+    import { baseEmailTemplate, emailTemplate } from './store';
     import { loadEmailTemplate } from './+page.svelte';
     import { page } from '$app/stores';
     import { addNotification } from '$lib/stores/notifications';
     import { Id } from '$lib/components';
+    import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
 
     export let localeCodes: Models.LocaleCode[];
     const projectId = $page.params.project;
@@ -20,16 +21,17 @@
         }, 1000);
         try {
             const template = await loadEmailTemplate(projectId, 'recovery', locale);
-            clearTimeout(timeout);
             emailTemplate.set(template);
             $baseEmailTemplate = { ...$emailTemplate };
+            trackEvent(Submit.EmailChangeLocale, { locale, type: 'recovery' });
         } catch (error) {
-            clearTimeout(timeout);
+            trackError(error, Submit.EmailChangeLocale);
             addNotification({
                 type: 'error',
                 message: error.message
             });
         } finally {
+            clearTimeout(timeout);
             loading = false;
         }
     }
diff --git a/src/routes/console/project-[project]/auth/templates/emailTemplate.svelte b/src/routes/console/project-[project]/auth/templates/emailTemplate.svelte
index 248b71523..403719755 100644
--- a/src/routes/console/project-[project]/auth/templates/emailTemplate.svelte
+++ b/src/routes/console/project-[project]/auth/templates/emailTemplate.svelte
@@ -11,12 +11,15 @@
     import { sdk } from '$lib/stores/sdk';
     import { project } from '../../store';
     import ResetEmail from './resetEmail.svelte';
-    import { baseEmailTemplate, emailTemplate } from './strote';
+    import { baseEmailTemplate, emailTemplate } from './store';
     import { deepEqual } from '$lib/helpers/object';
+    import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
 
     export let loading = false;
     let openResetModal = false;
 
+    let eventType = Submit.EmailUpdateInviteTemplate;
+
     async function saveEmailTemplate() {
         if (!$emailTemplate.locale) {
             addNotification({
@@ -26,6 +29,20 @@
             return;
         }
         try {
+            switch ($emailTemplate.type) {
+                case 'invitation':
+                    eventType = Submit.EmailUpdateInviteTemplate;
+                    break;
+                case 'magicSession':
+                    eventType = Submit.EmailUpdateMagicUrlTemplate;
+                    break;
+                case 'recovery':
+                    eventType = Submit.EmailUpdateRecoveryTemplate;
+                    break;
+                case 'verification':
+                    eventType = Submit.EmailUpdateVerificationTemplate;
+                    break;
+            }
             await sdk.forConsole.projects.updateEmailTemplate(
                 $project.$id,
                 $emailTemplate.type,
@@ -40,11 +57,16 @@
             $baseEmailTemplate = {
                 ...$emailTemplate
             };
+
             addNotification({
                 type: 'success',
                 message: `Email ${$emailTemplate.type} template for ${$emailTemplate.locale} updated`
             });
+            trackEvent(eventType, {
+                locale: $emailTemplate.locale
+            });
         } catch (e) {
+            trackError(e, eventType);
             addNotification({
                 type: 'error',
                 message: e.message
diff --git a/src/routes/console/project-[project]/auth/templates/emailVerificationTemplate.svelte b/src/routes/console/project-[project]/auth/templates/emailVerificationTemplate.svelte
index e09ec654b..ccc85aa37 100644
--- a/src/routes/console/project-[project]/auth/templates/emailVerificationTemplate.svelte
+++ b/src/routes/console/project-[project]/auth/templates/emailVerificationTemplate.svelte
@@ -3,10 +3,11 @@
     import LocaleOptions from './localeOptions.svelte';
     import type { Models } from '@appwrite.io/console';
     import { loadEmailTemplate } from './+page.svelte';
-    import { baseEmailTemplate, emailTemplate } from './strote';
+    import { baseEmailTemplate, emailTemplate } from './store';
     import { page } from '$app/stores';
     import { Id } from '$lib/components';
     import { addNotification } from '$lib/stores/notifications';
+    import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
 
     export let localeCodes: Models.LocaleCode[];
     const projectId = $page.params.project;
@@ -20,16 +21,17 @@
         }, 1000);
         try {
             const template = await loadEmailTemplate(projectId, 'verification', locale);
-            clearTimeout(timeout);
             emailTemplate.set(template);
             $baseEmailTemplate = { ...$emailTemplate };
+            trackEvent(Submit.EmailChangeLocale, { locale, type: 'verification' });
         } catch (error) {
-            clearTimeout(timeout);
+            trackError(error, Submit.EmailChangeLocale);
             addNotification({
                 type: 'error',
                 message: error.message
             });
         } finally {
+            clearTimeout(timeout);
             loading = false;
         }
     }
diff --git a/src/routes/console/project-[project]/auth/templates/resetEmail.svelte b/src/routes/console/project-[project]/auth/templates/resetEmail.svelte
index e14308c56..4e09434a6 100644
--- a/src/routes/console/project-[project]/auth/templates/resetEmail.svelte
+++ b/src/routes/console/project-[project]/auth/templates/resetEmail.svelte
@@ -1,10 +1,11 @@
 <script lang="ts">
+    import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { Modal } from '$lib/components';
     import { Button } from '$lib/elements/forms';
     import { sdk } from '$lib/stores/sdk';
     import { project } from '../../store';
     import { loadEmailTemplate } from './+page.svelte';
-    import { baseEmailTemplate, emailTemplate } from './strote';
+    import { baseEmailTemplate, emailTemplate } from './store';
 
     export let show = false;
 
@@ -23,8 +24,14 @@
                 $emailTemplate.locale
             );
             $baseEmailTemplate = { ...$emailTemplate };
+            trackEvent(Submit.EmailResetTemplate, {
+                locale: $emailTemplate.locale,
+                type: $emailTemplate.type
+            });
+
             show = false;
         } catch (e) {
+            trackError(e, Submit.EmailResetTemplate);
             error = e.message;
         }
     }
diff --git a/src/routes/console/project-[project]/auth/templates/resetSms.svelte b/src/routes/console/project-[project]/auth/templates/resetSms.svelte
index 06554d6fd..43f79b572 100644
--- a/src/routes/console/project-[project]/auth/templates/resetSms.svelte
+++ b/src/routes/console/project-[project]/auth/templates/resetSms.svelte
@@ -1,10 +1,11 @@
 <script lang="ts">
+    import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { Modal } from '$lib/components';
     import { Button } from '$lib/elements/forms';
     import { sdk } from '$lib/stores/sdk';
     import { project } from '../../store';
     import { loadSmsTemplate } from './+page.svelte';
-    import { baseSmsTemplate, smsTemplate } from './strote';
+    import { baseSmsTemplate, smsTemplate } from './store';
 
     export let show = false;
 
@@ -24,8 +25,13 @@
                 $smsTemplate.locale
             );
             $baseSmsTemplate = { ...$smsTemplate };
+            trackEvent(Submit.SmsResetTemplate, {
+                locale: $smsTemplate.locale,
+                type: $smsTemplate.type
+            });
             show = false;
         } catch (e) {
+            trackError(e, Submit.SmsResetTemplate);
             error = e.message;
         }
     }
diff --git a/src/routes/console/project-[project]/auth/templates/smsInvitationTemplate.svelte b/src/routes/console/project-[project]/auth/templates/smsInvitationTemplate.svelte
index 4fddc7c26..cf8b98577 100644
--- a/src/routes/console/project-[project]/auth/templates/smsInvitationTemplate.svelte
+++ b/src/routes/console/project-[project]/auth/templates/smsInvitationTemplate.svelte
@@ -2,11 +2,12 @@
     import SmsTemplate from './smsTemplate.svelte';
     import LocaleOptions from './localeOptions.svelte';
     import type { Models } from '@appwrite.io/console';
-    import { baseSmsTemplate, smsTemplate } from './strote';
+    import { baseSmsTemplate, smsTemplate } from './store';
     import { page } from '$app/stores';
     import { loadSmsTemplate } from './+page.svelte';
     import { addNotification } from '$lib/stores/notifications';
     import { Id } from '$lib/components';
+    import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
 
     export let localeCodes: Models.LocaleCode[];
 
@@ -20,16 +21,17 @@
         }, 1000);
         try {
             const template = await loadSmsTemplate(projectId, 'invitation', locale);
-            clearTimeout(timeout);
             smsTemplate.set(template);
             $baseSmsTemplate = { ...$smsTemplate };
+            trackEvent(Submit.SmsChangeLocale, { locale, type: 'invitation' });
         } catch (error) {
-            clearTimeout(timeout);
+            trackError(error, Submit.SmsChangeLocale);
             addNotification({
                 type: 'error',
                 message: error.message
             });
         } finally {
+            clearTimeout(timeout);
             loading = false;
         }
     }
diff --git a/src/routes/console/project-[project]/auth/templates/smsLoginTemplate.svelte b/src/routes/console/project-[project]/auth/templates/smsLoginTemplate.svelte
index 5e2b7cd93..1f9fbaf5a 100644
--- a/src/routes/console/project-[project]/auth/templates/smsLoginTemplate.svelte
+++ b/src/routes/console/project-[project]/auth/templates/smsLoginTemplate.svelte
@@ -4,9 +4,10 @@
     import type { Models } from '@appwrite.io/console';
     import { page } from '$app/stores';
     import { loadSmsTemplate } from './+page.svelte';
-    import { baseSmsTemplate, smsTemplate } from './strote';
+    import { baseSmsTemplate, smsTemplate } from './store';
     import { addNotification } from '$lib/stores/notifications';
     import { Id } from '$lib/components';
+    import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
 
     export let localeCodes: Models.LocaleCode[];
 
@@ -20,16 +21,18 @@
         }, 1000);
         try {
             const template = await loadSmsTemplate(projectId, 'login', locale);
-            clearTimeout(timeout);
             smsTemplate.set(template);
             $baseSmsTemplate = { ...$smsTemplate };
+            trackEvent(Submit.SmsChangeLocale, { locale, type: 'login' });
         } catch (error) {
-            clearTimeout(timeout);
+            trackError(error, Submit.SmsChangeLocale);
+
             addNotification({
                 type: 'error',
                 message: error.message
             });
         } finally {
+            clearTimeout(timeout);
             loading = false;
         }
     }
diff --git a/src/routes/console/project-[project]/auth/templates/smsTemplate.svelte b/src/routes/console/project-[project]/auth/templates/smsTemplate.svelte
index 80e9c5c71..b377234aa 100644
--- a/src/routes/console/project-[project]/auth/templates/smsTemplate.svelte
+++ b/src/routes/console/project-[project]/auth/templates/smsTemplate.svelte
@@ -2,15 +2,18 @@
     import { page } from '$app/stores';
     import { Button, Form, FormList, InputTextarea } from '$lib/elements/forms';
     import ResetSms from './resetSms.svelte';
-    import { baseSmsTemplate, smsTemplate } from './strote';
+    import { baseSmsTemplate, smsTemplate } from './store';
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
     import { deepEqual } from '$lib/helpers/object';
+    import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
 
     export let loading = false;
     const projectId = $page.params.project;
     let openResetModal = false;
 
+    let eventType = Submit.SmsUpdateInviteTemplate;
+
     async function saveSmsTemplate() {
         if (!$smsTemplate.locale) {
             addNotification({
@@ -20,6 +23,17 @@
             return;
         }
         try {
+            switch ($smsTemplate.type) {
+                case 'invitation':
+                    eventType = Submit.SmsUpdateInviteTemplate;
+                    break;
+                case 'login':
+                    eventType = Submit.SmsUpdateLoginTemplate;
+                    break;
+                case 'verification':
+                    eventType = Submit.SmsUpdateVerificationTemplate;
+                    break;
+            }
             await sdk.forConsole.projects.updateSmsTemplate(
                 projectId,
                 $smsTemplate.type,
@@ -34,7 +48,11 @@
                 type: 'success',
                 message: `SMS ${$smsTemplate.type} template for ${$smsTemplate.locale} updated`
             });
+            trackEvent(eventType, {
+                locale: $smsTemplate.locale
+            });
         } catch (e) {
+            trackError(e, eventType);
             addNotification({
                 type: 'error',
                 message: e.message
diff --git a/src/routes/console/project-[project]/auth/templates/smsVerificationTemplate.svelte b/src/routes/console/project-[project]/auth/templates/smsVerificationTemplate.svelte
index 82bd59687..20e3018c1 100644
--- a/src/routes/console/project-[project]/auth/templates/smsVerificationTemplate.svelte
+++ b/src/routes/console/project-[project]/auth/templates/smsVerificationTemplate.svelte
@@ -4,9 +4,10 @@
     import type { Models } from '@appwrite.io/console';
     import { page } from '$app/stores';
     import { loadSmsTemplate } from './+page.svelte';
-    import { baseSmsTemplate, smsTemplate } from './strote';
+    import { baseSmsTemplate, smsTemplate } from './store';
     import { Id } from '$lib/components';
     import { addNotification } from '$lib/stores/notifications';
+    import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
 
     export let localeCodes: Models.LocaleCode[];
 
@@ -20,16 +21,17 @@
         }, 1000);
         try {
             const template = await loadSmsTemplate(projectId, 'verification', locale);
-            clearTimeout(timeout);
             smsTemplate.set(template);
             $baseSmsTemplate = { ...$smsTemplate };
+            trackEvent(Submit.SmsChangeLocale, { locale, type: 'verification' });
         } catch (error) {
-            clearTimeout(timeout);
+            trackError(error, Submit.SmsChangeLocale);
             addNotification({
                 type: 'error',
                 message: error.message
             });
         } finally {
+            clearTimeout(timeout);
             loading = false;
         }
     }