diff --git a/apps/dashboard/src/lib/components/Course/components/Settings/index.svelte b/apps/dashboard/src/lib/components/Course/components/Settings/index.svelte
index 2ec6c0fb..c87d84a0 100644
--- a/apps/dashboard/src/lib/components/Course/components/Settings/index.svelte
+++ b/apps/dashboard/src/lib/components/Course/components/Settings/index.svelte
@@ -199,7 +199,7 @@
   $: courseLink = `${$currentOrgDomain}/course/${$course.slug}`;
 </script>
 
-<UnsavedChanges {hasUnsavedChanges} />
+<UnsavedChanges bind:hasUnsavedChanges />
 
 <DeleteModal onDelete={handleDeleteCourse} bind:open={openDeleteModal} />
 
diff --git a/apps/dashboard/src/lib/components/Org/Settings/LandingpageSettings.svelte b/apps/dashboard/src/lib/components/Org/Settings/LandingpageSettings.svelte
index 548daa07..13821b9f 100644
--- a/apps/dashboard/src/lib/components/Org/Settings/LandingpageSettings.svelte
+++ b/apps/dashboard/src/lib/components/Org/Settings/LandingpageSettings.svelte
@@ -1,25 +1,33 @@
 <script lang="ts">
-  import { Grid, Row, Column, RadioButtonGroup, RadioButton } from 'carbon-components-svelte';
-  import TrashCan from 'carbon-icons-svelte/lib/TrashCan.svelte';
-  import PrimaryButton from '$lib/components/PrimaryButton/index.svelte';
-  import Save from 'carbon-icons-svelte/lib/Save.svelte';
+  import { handleOpenWidget } from '$lib/components/CourseLandingPage/store';
+  import TextArea from '$lib/components/Form/TextArea.svelte';
+  import TextField from '$lib/components/Form/TextField.svelte';
   import IconButton from '$lib/components/IconButton/index.svelte';
   import { VARIANTS } from '$lib/components/PrimaryButton/constants';
-  import SectionTitle from '../SectionTitle.svelte';
-  import { Toggle } from 'carbon-components-svelte';
-  import TextField from '$lib/components/Form/TextField.svelte';
-  import TextArea from '$lib/components/Form/TextArea.svelte';
-  import { currentOrg } from '$lib/utils/store/org';
-  import { getSupabase } from '$lib/utils/functions/supabase';
+  import PrimaryButton from '$lib/components/PrimaryButton/index.svelte';
   import { snackbar } from '$lib/components/Snackbar/store';
-  import { landingPageSettings } from './store';
-  import type { OrgLandingPageJson } from './store';
+  import UnsavedChanges from '$lib/components/UnsavedChanges/index.svelte';
   import UploadWidget from '$lib/components/UploadWidget/index.svelte';
-  import { handleOpenWidget } from '$lib/components/CourseLandingPage/store';
+  import { getSupabase } from '$lib/utils/functions/supabase';
   import { t } from '$lib/utils/functions/translations';
+  import { currentOrg } from '$lib/utils/store/org';
+  import {
+    Column,
+    Grid,
+    RadioButton,
+    RadioButtonGroup,
+    Row,
+    Toggle
+  } from 'carbon-components-svelte';
+  import Save from 'carbon-icons-svelte/lib/Save.svelte';
+  import TrashCan from 'carbon-icons-svelte/lib/TrashCan.svelte';
+  import SectionTitle from '../SectionTitle.svelte';
+  import type { OrgLandingPageJson } from './store';
+  import { landingPageSettings } from './store';
 
   let isSaving = false;
   let creatingNewQuestion = false;
+  let hasUnsavedChanges = false;
   let widgetKey = '';
   const banner = [
     { value: 'video', label: `${$t('settings.landing_page.actions.banner_type.video')}` },
@@ -97,6 +105,7 @@
     } else {
       $currentOrg.landingpage = $landingPageSettings;
       snackbar.success('snackbar.success_update');
+      hasUnsavedChanges = false;
     }
 
     isSaving = false;
@@ -118,15 +127,19 @@
       };
     }
   }
-
   $: setDefault($currentOrg?.landingpage as unknown as OrgLandingPageJson);
 </script>
 
-<Grid class="border-c rounded border-gray-200 dark:border-neutral-600 w-full mt-5 relative">
-  <Row class="flex lg:flex-row flex-col py-7 border-bottom-c">
+<UnsavedChanges bind:hasUnsavedChanges />
+<Grid class="border-c relative mt-5 w-full rounded border-gray-200 dark:border-neutral-600">
+  <Row class="border-bottom-c flex flex-col py-7 lg:flex-row">
     <Column sm={4} md={4} lg={4}>
       <SectionTitle>{$t('settings.landing_page.heading')}</SectionTitle>
-      <Toggle bind:toggled={$landingPageSettings.header.show} size="sm">
+      <Toggle
+        bind:toggled={$landingPageSettings.header.show}
+        size="sm"
+        on:change={() => (hasUnsavedChanges = true)}
+      >
         <span slot="labelA" style="color: gray">{$t('settings.landing_page.hide_section')}</span>
         <span slot="labelB" style="color: gray">{$t('settings.landing_page.show_section')}</span>
       </Toggle>
@@ -136,6 +149,7 @@
         label={$t('settings.landing_page.title')}
         placeholder={$t('course.navItem.lessons.exercises.all_exercises.write_your_title')}
         bind:value={$landingPageSettings.header.title}
+        onChange={() => (hasUnsavedChanges = true)}
         className="w-full mb-5"
       />
       <TextField
@@ -143,6 +157,7 @@
         placeholder={$t('course.navItem.lessons.exercises.all_exercises.highlight')}
         className="w-full mb-5"
         bind:value={$landingPageSettings.header.titleHighlight}
+        onChange={() => (hasUnsavedChanges = true)}
       />
 
       <TextArea
@@ -151,6 +166,7 @@
         placeholder={$t('course.navItem.lessons.exercises.all_exercises.write_your_subtitle')}
         className="w-full mb-5"
         bind:value={$landingPageSettings.header.subtitle}
+        onChange={() => (hasUnsavedChanges = true)}
         isAIEnabled={true}
       />
 
@@ -160,14 +176,20 @@
         placeholder={$t('course.navItem.lessons.exercises.all_exercises.label')}
         className="w-full mt-3 mb-5"
         bind:value={$landingPageSettings.header.action.label}
+        onChange={() => (hasUnsavedChanges = true)}
       />
-      <div class="gap-2 mb-5">
+      <div class="mb-5 gap-2">
         <TextField
           label={$t('settings.landing_page.actions.link')}
           placeholder={$t('course.navItem.lessons.exercises.all_exercises.link')}
           bind:value={$landingPageSettings.header.action.link}
+          onChange={() => (hasUnsavedChanges = true)}
         />
-        <Toggle bind:toggled={$landingPageSettings.header.action.redirect} size="sm">
+        <Toggle
+          bind:toggled={$landingPageSettings.header.action.redirect}
+          size="sm"
+          on:change={() => (hasUnsavedChanges = true)}
+        >
           <span slot="labelA" style="color: gray"
             >{$t('settings.landing_page.actions.no_redirect')}</span
           >
@@ -181,18 +203,20 @@
       <RadioButtonGroup
         legendText={$t('settings.landing_page.actions.banner_type.heading')}
         bind:selected={$landingPageSettings.header.banner.type}
-        class="mt-10 mb-5"
+        on:change={() => (hasUnsavedChanges = true)}
+        class="mb-5 mt-10"
       >
         {#each banner as item}
           <RadioButton value={item.value} labelText={item.label} />
         {/each}
       </RadioButtonGroup>
       {#if $landingPageSettings.header.banner.type === 'video'}
-        <div class="gap-2 mt-3 mb-5">
+        <div class="mb-5 mt-3 gap-2">
           <TextField
             label={$t('settings.landing_page.actions.link')}
             placeholder={$t('course.navItem.lessons.exercises.all_exercises.video')}
             bind:value={$landingPageSettings.header.banner.video}
+            onChange={() => (hasUnsavedChanges = true)}
           />
         </div>
       {:else}
@@ -207,11 +231,15 @@
         <img
           alt="bannerImage"
           src={$landingPageSettings.header.banner.image}
-          class="mt-2 rounded-md w-full"
+          class="mt-2 w-full rounded-md"
         />
       {/if}
 
-      <Toggle bind:toggled={$landingPageSettings.header.banner.show} size="sm">
+      <Toggle
+        bind:toggled={$landingPageSettings.header.banner.show}
+        size="sm"
+        on:change={() => (hasUnsavedChanges = true)}
+      >
         <span slot="labelA" style="color: gray"
           >{$t('settings.landing_page.actions.hide_banner')}</span
         >
@@ -220,13 +248,16 @@
         >
       </Toggle>
       {#if $handleOpenWidget.open && widgetKey === 'banner'}
-        <UploadWidget bind:imageURL={$landingPageSettings.header.banner.image} />
+        <UploadWidget
+          bind:imageURL={$landingPageSettings.header.banner.image}
+          on:change={() => (hasUnsavedChanges = true)}
+        />
       {/if}
 
       <!-- background -->
 
       <div class="mt-4">
-        <p class="font-bold mb-4">{$t('settings.landing_page.background.title')}</p>
+        <p class="mb-4 font-bold">{$t('settings.landing_page.background.title')}</p>
         <PrimaryButton
           variant={VARIANTS.OUTLINED}
           label={$t('settings.landing_page.about.select_image')}
@@ -238,7 +269,7 @@
           <img
             alt="backgroundImage"
             src={$landingPageSettings.header.background.image}
-            class="mt-2 rounded-md w-full"
+            class="mt-2 w-full rounded-md"
           />
         {/if}
 
@@ -252,16 +283,24 @@
         </Toggle>
 
         {#if $handleOpenWidget.open && widgetKey === 'background'}
-          <UploadWidget bind:imageURL={$landingPageSettings.header.background.image} />
+          <UploadWidget
+            bind:imageURL={$landingPageSettings.header.background.image}
+            on:change={() => (hasUnsavedChanges = true)}
+          />
         {/if}
       </div>
     </Column>
   </Row>
 
-  <Row class="flex lg:flex-row flex-col py-7 border-bottom-c">
+  <Row class="border-bottom-c flex flex-col py-7 lg:flex-row">
     <Column sm={4} md={4} lg={4}
       ><SectionTitle>{$t('settings.landing_page.about.heading')}</SectionTitle>
-      <Toggle bind:toggled={$landingPageSettings.aboutUs.show} size="sm">
+
+      <Toggle
+        bind:toggled={$landingPageSettings.aboutUs.show}
+        on:change={() => (hasUnsavedChanges = true)}
+        size="sm"
+      >
         <span slot="labelA" style="color: gray">{$t('settings.landing_page.hide_section')}</span>
         <span slot="labelB" style="color: gray">{$t('settings.landing_page.show_section')}</span>
       </Toggle></Column
@@ -271,6 +310,7 @@
         label={$t('settings.landing_page.about.title')}
         placeholder={$t('course.navItem.lessons.exercises.all_exercises.write_your_title')}
         bind:value={$landingPageSettings.aboutUs.title}
+        onChange={() => (hasUnsavedChanges = true)}
         className="mb-5"
       />
 
@@ -280,6 +320,7 @@
         placeholder={$t('course.navItem.lessons.exercises.all_exercises.content')}
         className="mb-5"
         bind:value={$landingPageSettings.aboutUs.content}
+        onChange={() => (hasUnsavedChanges = true)}
         isAIEnabled={true}
       />
 
@@ -295,7 +336,7 @@
           <img
             alt="About us"
             src={$landingPageSettings.aboutUs.imageUrl}
-            class="mt-2 rounded-md w-full"
+            class="mt-2 w-full rounded-md"
           />
         {/if}
         {#if $handleOpenWidget.open && widgetKey === 'about-us'}
@@ -305,10 +346,14 @@
     </Column>
   </Row>
 
-  <Row class="flex lg:flex-row flex-col py-7 border-bottom-c">
+  <Row class="border-bottom-c flex flex-col py-7 lg:flex-row">
     <Column sm={4} md={4} lg={4}
       ><SectionTitle>{$t('settings.landing_page.courses.heading')}</SectionTitle>
-      <Toggle bind:toggled={$landingPageSettings.courses.show} size="sm">
+      <Toggle
+        bind:toggled={$landingPageSettings.courses.show}
+        size="sm"
+        on:change={() => (hasUnsavedChanges = true)}
+      >
         <span slot="labelA" style="color: gray"
           >{$t('settings.landing_page.courses.hide_section')}</span
         >
@@ -322,26 +367,33 @@
         label={$t('settings.landing_page.courses.title')}
         placeholder={$t('course.navItem.lessons.exercises.all_exercises.write_your_title')}
         bind:value={$landingPageSettings.courses.title}
+        onChange={() => (hasUnsavedChanges = true)}
       />
       <TextField
         label={$t('settings.landing_page.courses.title_highlight')}
         placeholder={$t('course.navItem.lessons.exercises.all_exercises.highlight')}
         bind:value={$landingPageSettings.courses.titleHighlight}
+        onChange={() => (hasUnsavedChanges = true)}
       />
       <TextArea
         label={$t('settings.landing_page.courses.subtitle')}
         labelClassName="font-light"
         placeholder={$t('course.navItem.lessons.exercises.all_exercises.write_your_subtitle')}
         bind:value={$landingPageSettings.courses.subtitle}
+        onChange={() => (hasUnsavedChanges = true)}
         isAIEnabled={true}
       />
     </Column>
   </Row>
 
-  <Row class="flex lg:flex-row flex-col py-7 border-bottom-c">
+  <Row class="border-bottom-c flex flex-col py-7 lg:flex-row">
     <Column sm={4} md={4} lg={4}
       ><SectionTitle>{$t('settings.landing_page.faq.heading')}</SectionTitle>
-      <Toggle bind:toggled={$landingPageSettings.faq.show} size="sm">
+      <Toggle
+        bind:toggled={$landingPageSettings.faq.show}
+        size="sm"
+        on:change={() => (hasUnsavedChanges = true)}
+      >
         <span slot="labelA" style="color: gray">{$t('settings.landing_page.faq.hide_section')}</span
         >
         <span slot="labelB" style="color: gray">{$t('settings.landing_page.faq.show_section')}</span
@@ -353,6 +405,7 @@
         label={$t('settings.landing_page.faq.title')}
         placeholder={$t('course.navItem.lessons.exercises.all_exercises.write_your_title')}
         bind:value={$landingPageSettings.faq.title}
+        onChange={() => (hasUnsavedChanges = true)}
         className="mb-5"
       />
       {#each $landingPageSettings.faq.questions as item (item.id)}
@@ -363,6 +416,7 @@
               'course.navItem.lessons.exercises.all_exercises.write_your_question_here'
             )}
             bind:value={item.title}
+            onChange={() => (hasUnsavedChanges = true)}
             className="mb-5"
           />
           <TextArea
@@ -373,6 +427,7 @@
             )}
             bind:value={item.content}
             className="mb-5"
+            onChange={() => (hasUnsavedChanges = true)}
             isAIEnabled={true}
           />
           <IconButton onClick={() => deleteFaq(item.id)}>
@@ -387,6 +442,7 @@
             'course.navItem.lessons.exercises.all_exercises.write_your_question_here'
           )}
           bind:value={newQuestion.title}
+          onChange={() => (hasUnsavedChanges = true)}
           className="mb-5"
         />
         <TextArea
@@ -394,6 +450,7 @@
           labelClassName="font-light"
           placeholder={$t('course.navItem.lessons.exercises.all_exercises.write_your_answer_here')}
           bind:value={newQuestion.content}
+          onChange={() => (hasUnsavedChanges = true)}
           className="mb-5"
           isAIEnabled={true}
         />
@@ -419,10 +476,14 @@
     </Column>
   </Row>
 
-  <Row class="flex lg:flex-row flex-col py-7 border-bottom-c">
+  <Row class="border-bottom-c flex flex-col py-7 lg:flex-row">
     <Column sm={4} md={4} lg={4}
       ><SectionTitle>{$t('settings.landing_page.contact_us.heading')}</SectionTitle>
-      <Toggle bind:toggled={$landingPageSettings.contact.show} size="sm">
+      <Toggle
+        bind:toggled={$landingPageSettings.contact.show}
+        size="sm"
+        on:change={() => (hasUnsavedChanges = true)}
+      >
         <span slot="labelA" style="color: gray"
           >{$t('settings.landing_page.contact_us.hide_section')}</span
         >
@@ -436,6 +497,7 @@
         label={$t('settings.landing_page.contact_us.title')}
         placeholder={$t('course.navItem.lessons.exercises.all_exercises.write_your_title')}
         bind:value={$landingPageSettings.contact.title}
+        onChange={() => (hasUnsavedChanges = true)}
         className="mb-5"
       />
       <TextField
@@ -444,6 +506,7 @@
         placeholder={$t('course.navItem.lessons.exercises.all_exercises.highlight')}
         className="mb-5"
         bind:value={$landingPageSettings.contact.titleHighlight}
+        onChange={() => (hasUnsavedChanges = true)}
       />
       <TextArea
         label={$t('settings.landing_page.contact_us.subtitle')}
@@ -451,6 +514,7 @@
         placeholder={$t('course.navItem.lessons.exercises.all_exercises.write_your_subtitle')}
         className="mt-3 mb-5"
         bind:value={$landingPageSettings.contact.subtitle}
+        onChange={() => (hasUnsavedChanges = true)}
         isAIEnabled={true}
       />
       <TextField
@@ -458,20 +522,26 @@
         placeholder={$t('course.navItem.lessons.exercises.all_exercises.number')}
         className="mt-3 mb-5"
         bind:value={$landingPageSettings.contact.phone}
+        onChange={() => (hasUnsavedChanges = true)}
       />
       <TextField
         label={$t('settings.landing_page.contact_us.email')}
         placeholder={$t('course.navItem.lessons.exercises.all_exercises.email')}
         className="mt-3 mb-5"
         bind:value={$landingPageSettings.contact.email}
+        onChange={() => (hasUnsavedChanges = true)}
       />
     </Column>
   </Row>
 
-  <Row class="flex lg:flex-row flex-col py-7 border-bottom-c">
+  <Row class="border-bottom-c flex flex-col py-7 lg:flex-row">
     <Column sm={4} md={4} lg={4}
       ><SectionTitle>{$t('settings.landing_page.mailing_list.heading')}</SectionTitle>
-      <Toggle bind:toggled={$landingPageSettings.mailinglist.show} size="sm">
+      <Toggle
+        bind:toggled={$landingPageSettings.mailinglist.show}
+        size="sm"
+        on:change={() => (hasUnsavedChanges = true)}
+      >
         <span slot="labelA" style="color: gray"
           >{$t('settings.landing_page.mailing_list.hide_section')}</span
         >
@@ -485,6 +555,7 @@
         label={$t('settings.landing_page.mailing_list.title')}
         placeholder={$t('course.navItem.lessons.exercises.all_exercises.write_your_title')}
         bind:value={$landingPageSettings.mailinglist.title}
+        onChange={() => (hasUnsavedChanges = true)}
         className="mb-5"
       />
       <TextArea
@@ -493,6 +564,7 @@
         placeholder={$t('course.navItem.lessons.exercises.all_exercises.write_your_subtitle')}
         className="mb-5"
         bind:value={$landingPageSettings.mailinglist.subtitle}
+        onChange={() => (hasUnsavedChanges = true)}
         isAIEnabled={true}
       />
 
@@ -501,14 +573,19 @@
         placeholder={$t('course.navItem.lessons.exercises.all_exercises.label')}
         className="mb-5"
         bind:value={$landingPageSettings.mailinglist.buttonLabel}
+        onChange={() => (hasUnsavedChanges = true)}
       />
     </Column>
   </Row>
 
-  <Row class="flex lg:flex-row flex-col py-7">
+  <Row class="flex flex-col py-7 lg:flex-row">
     <Column sm={4} md={4} lg={4}
       ><SectionTitle>{$t('settings.landing_page.footer.heading')}</SectionTitle>
-      <Toggle bind:toggled={$landingPageSettings.footer.show} size="sm">
+      <Toggle
+        bind:toggled={$landingPageSettings.footer.show}
+        size="sm"
+        on:change={() => (hasUnsavedChanges = true)}
+      >
         <span slot="labelA" style="color: gray"
           >{$t('settings.landing_page.footer.hide_section')}</span
         >
@@ -522,6 +599,7 @@
         label={$t('settings.landing_page.footer.facebook')}
         placeholder={$t('course.navItem.lessons.exercises.all_exercises.facebook')}
         bind:value={$landingPageSettings.footer.facebook}
+        onChange={() => (hasUnsavedChanges = true)}
         className="mb-5"
       />
       <!-- <TextField
@@ -535,16 +613,18 @@
         placeholder={$t('course.navItem.lessons.exercises.all_exercises.twitter')}
         className="mb-5"
         bind:value={$landingPageSettings.footer.twitter}
+        onChange={() => (hasUnsavedChanges = true)}
       />
       <TextField
         label={$t('settings.landing_page.footer.linkedin')}
         placeholder={$t('course.navItem.lessons.exercises.all_exercises.linkedin')}
         className="mb-5"
         bind:value={$landingPageSettings.footer.linkedin}
+        onChange={() => (hasUnsavedChanges = true)}
       />
     </Column>
   </Row>
-  <div class="sticky desktop float-right bottom-12 mr-2 z-[120]">
+  <div class="desktop sticky bottom-12 z-[120] float-right mr-2">
     <PrimaryButton
       label={$t('settings.landing_page.save_changes')}
       isLoading={isSaving}
@@ -555,12 +635,12 @@
 </Grid>
 
 <div
-  class="absolute
- mobile right-6 bottom-8 z-[120]"
+  class="mobile
+ absolute bottom-8 right-6 z-[120]"
 >
   <span>
     <IconButton onClick={handleSave} disabled={isSaving}>
-      <Save size={40} class=" bg-blue-700 p-1 rounded-full" />
+      <Save size={40} class=" rounded-full bg-blue-700 p-1" />
     </IconButton>
   </span>
 </div>
diff --git a/apps/dashboard/src/lib/components/Org/Settings/OrgSettings.svelte b/apps/dashboard/src/lib/components/Org/Settings/OrgSettings.svelte
index 748d2e23..3700a485 100644
--- a/apps/dashboard/src/lib/components/Org/Settings/OrgSettings.svelte
+++ b/apps/dashboard/src/lib/components/Org/Settings/OrgSettings.svelte
@@ -1,25 +1,26 @@
 <script lang="ts">
   import { goto } from '$app/navigation';
+  import { Column, Grid, Row } from 'carbon-components-svelte';
+  import FlashFilled from 'carbon-icons-svelte/lib/FlashFilled.svelte';
   import debounce from 'lodash/debounce';
   import ColorPicker from 'svelte-awesome-color-picker';
-  import { Grid, Row, Column } from 'carbon-components-svelte';
-  import FlashFilled from 'carbon-icons-svelte/lib/FlashFilled.svelte';
 
-  import { isFreePlan } from '$lib/utils/store/org';
-  import { t } from '$lib/utils/functions/translations';
-  import { supabase } from '$lib/utils/functions/supabase';
   import { snackbar } from '$lib/components/Snackbar/store';
-  import { currentOrg, currentOrgPath } from '$lib/utils/store/org';
+  import { supabase } from '$lib/utils/functions/supabase';
+  import { injectCustomTheme, setCustomTheme, setTheme } from '$lib/utils/functions/theme';
+  import { t } from '$lib/utils/functions/translations';
   import { updateOrgNameValidation } from '$lib/utils/functions/validator';
-  import { setTheme, setCustomTheme, injectCustomTheme } from '$lib/utils/functions/theme';
+  import { currentOrg, currentOrgPath, isFreePlan } from '$lib/utils/store/org';
 
-  import SectionTitle from '../SectionTitle.svelte';
   import TextField from '$lib/components/Form/TextField.svelte';
   import { VARIANTS } from '$lib/components/PrimaryButton/constants';
-  import UploadImage from '$lib/components/UploadImage/index.svelte';
   import PrimaryButton from '$lib/components/PrimaryButton/index.svelte';
+  import UnsavedChanges from '$lib/components/UnsavedChanges/index.svelte';
+  import UploadImage from '$lib/components/UploadImage/index.svelte';
+  import SectionTitle from '../SectionTitle.svelte';
 
   let avatar;
+  let hasUnsavedChanges = false;
 
   type Error = {
     orgName: string;
@@ -123,7 +124,7 @@
       }));
 
       snackbar.success('snackbar.course_settings.success.update_successful');
-
+      hasUnsavedChanges = false;
       if (error) throw error;
     } catch (error) {
       let message = error as string;
@@ -151,17 +152,19 @@
   $: isCustomTheme = hex && !hex.includes('theme-');
 </script>
 
-<Grid class="border-c rounded border-gray-200 dark:border-neutral-600 w-full mt-5">
-  <Row class="flex lg:flex-row flex-col py-7 border-bottom-c">
+<UnsavedChanges bind:hasUnsavedChanges />
+<Grid class="border-c mt-5 w-full rounded border-gray-200 dark:border-neutral-600">
+  <Row class="border-bottom-c flex flex-col py-7 lg:flex-row">
     <Column sm={4} md={4} lg={4}>
       <SectionTitle>
         {$t('settings.organization.organization_profile.heading')}
       </SectionTitle>
     </Column>
-    <Column sm={8} md={8} lg={8} class="mt-2 lg:mt-0 flex flex-col items-center lg:items-start">
+    <Column sm={8} md={8} lg={8} class="mt-2 flex flex-col items-center lg:mt-0 lg:items-start">
       <TextField
         label={$t('settings.organization.organization_profile.organization_name')}
         bind:value={$currentOrg.name}
+        onChange={() => (hasUnsavedChanges = true)}
         className="w-full lg:w-60 mb-5"
         errorMessage={errors.orgName}
       />
@@ -170,6 +173,7 @@
         src={$currentOrg.avatar_url}
         shape="rounded-md"
         widthHeight="w-24 h-24"
+        on:change={() => (hasUnsavedChanges = true)}
       />
       <PrimaryButton
         label={$t('settings.organization.organization_profile.update_organization')}
@@ -180,7 +184,7 @@
       />
     </Column>
   </Row>
-  <Row class="flex lg:flex-row flex-col py-7 border-bottom-c relative">
+  <Row class="border-bottom-c relative flex flex-col py-7 lg:flex-row">
     <Column sm={4} md={4} lg={4}
       ><SectionTitle>{$t('settings.organization.organization_profile.theme.heading')}</SectionTitle
       ></Column
@@ -193,57 +197,57 @@
       <div class="flex items-center gap-5">
         <button
           class="rounded-full border-2 {$currentOrg.theme === themes.default &&
-            'border-[#1d4ee2]'} flex items-center justify-center h-fit"
+            'border-[#1d4ee2]'} flex h-fit items-center justify-center"
           on:click={handleChangeTheme(themes.default)}
         >
-          <div class="w-6 h-6 md:w-6 md:h-6 bg-[#1d4ee2] rounded-full m-1" />
+          <div class="m-1 h-6 w-6 rounded-full bg-[#1d4ee2] md:h-6 md:w-6" />
         </button>
 
         <button
           class="rounded-full border-2 {$currentOrg.theme === themes.rose &&
-            'border-[#be1241]'} flex items-center justify-center h-fit"
+            'border-[#be1241]'} flex h-fit items-center justify-center"
           on:click={handleChangeTheme(themes.rose)}
         >
-          <div class="w-6 h-6 md:w-6 md:h-6 bg-[#be1241] rounded-full m-1" />
+          <div class="m-1 h-6 w-6 rounded-full bg-[#be1241] md:h-6 md:w-6" />
         </button>
 
         <button
           class="rounded-full border-2 {$currentOrg.theme === themes.green &&
-            'border-[#0c891b]'} flex items-center justify-center h-fit"
+            'border-[#0c891b]'} flex h-fit items-center justify-center"
           on:click={handleChangeTheme(themes.green)}
         >
-          <div class="w-6 h-6 md:w-6 md:h-6 bg-[#0c891b] rounded-full m-1" />
+          <div class="m-1 h-6 w-6 rounded-full bg-[#0c891b] md:h-6 md:w-6" />
         </button>
 
         <button
           class="rounded-full border-2 {$currentOrg.theme === themes.orange &&
-            'border-[#cc4902]'} flex items-center justify-center h-fit"
+            'border-[#cc4902]'} flex h-fit items-center justify-center"
           on:click={handleChangeTheme(themes.orange)}
         >
-          <div class="w-6 h-6 md:w-6 md:h-6 bg-[#cc4902] rounded-full m-1" />
+          <div class="m-1 h-6 w-6 rounded-full bg-[#cc4902] md:h-6 md:w-6" />
         </button>
 
         <button
           class="rounded-full border-2 {$currentOrg.theme === themes.violet &&
-            'border-[#cf00ce]'} flex items-center justify-center h-fit"
+            'border-[#cf00ce]'} flex h-fit items-center justify-center"
           on:click={handleChangeTheme(themes.violet)}
         >
-          <div class="w-6 h-6 md:w-6 md:h-6 bg-[#cf00ce] rounded-full m-1" />
+          <div class="m-1 h-6 w-6 rounded-full bg-[#cf00ce] md:h-6 md:w-6" />
         </button>
 
         <div
-          class="w-fit h-auto border-2 {isCustomTheme
+          class="h-auto w-fit border-2 {isCustomTheme
             ? 'border-primary-700'
-            : 'dark:border-neutral-700'} rounded-full relative group"
+            : 'dark:border-neutral-700'} group relative rounded-full"
         >
           <!-- plus icon positioned over the color picker -->
           <div
-            class="absolute inset-0 flex items-center justify-center pointer-events-none transition-opacity duration-200"
+            class="pointer-events-none absolute inset-0 flex items-center justify-center transition-opacity duration-200"
           >
             <svg
-              class="w-6 h-6 text-{isCustomTheme
+              class="h-6 w-6 text-{isCustomTheme
                 ? 'white'
-                : 'black'} dark:text-white z-10 opacity-100"
+                : 'black'} z-10 opacity-100 dark:text-white"
               fill="none"
               stroke="currentColor"
               stroke-width="2"
@@ -259,7 +263,7 @@
     </Column>
   </Row>
 
-  <Row class="flex lg:flex-row flex-col py-7 border-bottom-c">
+  <Row class="border-bottom-c flex flex-col py-7 lg:flex-row">
     <Column sm={4} md={4} lg={4}>
       <SectionTitle>
         {$t('settings.organization.organization_profile.customize_lms.heading')}
@@ -281,7 +285,7 @@
       </PrimaryButton>
     </Column>
   </Row>
-  <Row class="flex lg:flex-row flex-col py-7 border-bottom-c">
+  <Row class="border-bottom-c flex flex-col py-7 lg:flex-row">
     <Column sm={4} md={4} lg={4}
       ><SectionTitle
         >{$t('settings.organization.organization_profile.custom_domain.heading')}</SectionTitle
@@ -306,7 +310,7 @@
       </PrimaryButton>
     </Column>
   </Row>
-  <Row class="flex lg:flex-row flex-col py-7 border-bottom-c">
+  <Row class="border-bottom-c flex flex-col py-7 lg:flex-row">
     <Column sm={4} md={4} lg={4}
       ><SectionTitle>{$t('settings.organization.organization_profile.team.heading')}</SectionTitle
       ></Column
diff --git a/apps/dashboard/src/lib/components/Org/Settings/Profile.svelte b/apps/dashboard/src/lib/components/Org/Settings/Profile.svelte
index 9a0e876e..dfe5e3ca 100644
--- a/apps/dashboard/src/lib/components/Org/Settings/Profile.svelte
+++ b/apps/dashboard/src/lib/components/Org/Settings/Profile.svelte
@@ -3,6 +3,7 @@
   import { VARIANTS } from '$lib/components/PrimaryButton/constants';
   import PrimaryButton from '$lib/components/PrimaryButton/index.svelte';
   import { snackbar } from '$lib/components/Snackbar/store';
+  import UnsavedChanges from '$lib/components/UnsavedChanges/index.svelte';
   import UploadImage from '$lib/components/UploadImage/index.svelte';
   import generateUUID from '$lib/utils/functions/generateUUID';
   import { supabase } from '$lib/utils/functions/supabase';
@@ -17,6 +18,7 @@
   let loading = false;
   let hasLangChanged = false;
   let locale = '';
+  let hasUnsavedChanges = false;
 
   let errors = {};
 
@@ -66,7 +68,7 @@
       if (hasLangChanged) {
         handleLocaleChange(locale);
       }
-
+      hasUnsavedChanges = false;
       if (error) throw error;
     } catch (error) {
       let message = error.message;
@@ -83,16 +85,22 @@
   $: locale = !locale ? $profile.locale : locale;
 </script>
 
-<Grid class="border-c rounded border-gray-200 dark:border-neutral-600 w-full mt-5">
-  <Row class="flex flex-col lg:flex-row items-center lg:items-start py-7 border-bottom-c ">
+<UnsavedChanges bind:hasUnsavedChanges />
+<Grid class="border-c mt-5 w-full rounded border-gray-200 dark:border-neutral-600">
+  <Row class="border-bottom-c flex flex-col items-center py-7 lg:flex-row lg:items-start ">
     <Column sm={4} md={8} lg={4} class="mt-2 md:mt-0">
       <SectionTitle>{$t('settings.profile.profile_picture.heading')}</SectionTitle>
     </Column>
     <Column sm={2} md={4} lg={8} class="mt-2 lg:mt-0">
-      <UploadImage bind:avatar src={$profile.avatar_url} widthHeight="w-16 h-16 lg:w-24 lg:h-24" />
+      <UploadImage
+        bind:avatar
+        src={$profile.avatar_url}
+        widthHeight="w-16 h-16 lg:w-24 lg:h-24"
+        on:change={() => (hasUnsavedChanges = true)}
+      />
     </Column>
   </Row>
-  <Row class="flex flex-col lg:flex-row py-7 border-bottom-c">
+  <Row class="border-bottom-c flex flex-col py-7 lg:flex-row">
     <Column sm={4} md={4} lg={4}>
       <SectionTitle>{$t('settings.profile.personal_information.heading')}</SectionTitle>
     </Column>
@@ -102,24 +110,32 @@
         bind:value={$profile.fullname}
         className="w-full lg:w-60 mb-4"
         errorMessage={$t(errors.fullname)}
+        onChange={() => (hasUnsavedChanges = true)}
       />
       <TextField
         label={$t('settings.profile.personal_information.username')}
         bind:value={$profile.username}
         className="w-full lg:w-60 mb-4"
         errorMessage={$t(errors.username)}
+        onChange={() => (hasUnsavedChanges = true)}
       />
       <TextField
         label={$t('settings.profile.personal_information.email')}
         bind:value={$profile.email}
         className="w-full lg:w-60 mb-4"
         errorMessage={$t(errors.email)}
+        onChange={() => (hasUnsavedChanges = true)}
+      />
+      <LanguagePicker
+        onChange={() => (hasUnsavedChanges = true)}
+        bind:hasLangChanged
+        bind:value={locale}
+        className="w-full lg:w-60 mb-4"
       />
-      <LanguagePicker bind:hasLangChanged bind:value={locale} className="w-full lg:w-60 mb-4" />
     </Column>
   </Row>
 
-  <Row class="m-5 w-full flex items-center gap-2 lg:justify-center">
+  <Row class="m-5 flex w-full items-center gap-2 lg:justify-center">
     <PrimaryButton
       label={$t('settings.profile.update_profile')}
       variant={VARIANTS.CONTAINED_DARK}
diff --git a/apps/dashboard/src/lib/components/UnsavedChanges/index.svelte b/apps/dashboard/src/lib/components/UnsavedChanges/index.svelte
index 6c734154..56bd29eb 100644
--- a/apps/dashboard/src/lib/components/UnsavedChanges/index.svelte
+++ b/apps/dashboard/src/lib/components/UnsavedChanges/index.svelte
@@ -1,24 +1,29 @@
 <script lang="ts">
-	import { beforeNavigate } from '$app/navigation';
+  import { beforeNavigate } from '$app/navigation';
+  import { t } from '$lib/utils/functions/translations';
 
-	export let hasUnsavedChanges = false;
-	export let message = 'You have unsaved changes. Are you sure you want to leave?';
+  export let hasUnsavedChanges = false;
 
-	beforeNavigate(({ cancel }) => {
-		if (!shouldAbandonChanges()) cancel();
-	});
+  beforeNavigate(({ cancel }) => {
+    if (!shouldAbandonChanges()) {
+      cancel();
+    } else {
+      // User clicked OK, reset the flag
+      hasUnsavedChanges = false;
+    }
+  });
 
-	function shouldAbandonChanges() {
-		if (!hasUnsavedChanges) return true;
-		return confirm(message);
-	}
+  function shouldAbandonChanges() {
+    if (!hasUnsavedChanges) return true;
+    return window.confirm($t('common.unsaved_changes.message'));
+  }
 </script>
 
 <svelte:window
-	on:beforeunload={(e) => {
-		const result = shouldAbandonChanges();
-		if (!result) e.preventDefault();
-	}}
+  on:beforeunload={(e) => {
+    const result = shouldAbandonChanges();
+    if (!result) e.preventDefault();
+  }}
 />
 
 <slot />
diff --git a/apps/dashboard/src/lib/components/UploadImage/index.svelte b/apps/dashboard/src/lib/components/UploadImage/index.svelte
index 8447479c..803b7438 100644
--- a/apps/dashboard/src/lib/components/UploadImage/index.svelte
+++ b/apps/dashboard/src/lib/components/UploadImage/index.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
-  import Camera from 'carbon-icons-svelte/lib/Camera.svelte';
-  import { Loading } from 'carbon-components-svelte';
   import { t } from '$lib/utils/functions/translations';
+  import { Loading } from 'carbon-components-svelte';
+  import Camera from 'carbon-icons-svelte/lib/Camera.svelte';
+  import { createEventDispatcher } from 'svelte';
 
   export let avatar: string | undefined;
   export let src: string | undefined;
@@ -14,6 +15,7 @@
   export let isUploading = false;
 
   let fileinput: HTMLInputElement;
+  const dispatch = createEventDispatcher();
 
   const onFileSelected = (e: Event<HTMLInputElement>) => {
     const image = e.target.files[0];
@@ -28,6 +30,7 @@
     reader.readAsDataURL(image);
     reader.onload = (e) => {
       avatar = image;
+      dispatch('change');
       // @ts-ignore
       src = e.target?.result || undefined;
       errorMessage = null; // Clear error message on successful load
@@ -35,18 +38,18 @@
   };
 </script>
 
-<section class="width-fit p-3 flex {flexDirection} items-center justify-between gap-5">
+<section class="width-fit flex p-3 {flexDirection} items-center justify-between gap-5">
   <div
     class="avatar-container {widthHeight ||
-      'setwidthheight'} pointer border-2 border-gray-200 dark:border-neutral-600 relative {shape}"
+      'setwidthheight'} pointer relative border-2 border-gray-200 dark:border-neutral-600 {shape}"
   >
     {#if src}
-      <img class="w-full h-full {shape}" {src} alt="Avatar" />
+      <img class="h-full w-full {shape}" {src} alt="Avatar" />
     {:else if avatar}
-      <img class="w-full h-full {shape}" src={avatar} alt="Avatar" />
+      <img class="h-full w-full {shape}" src={avatar} alt="Avatar" />
     {:else}
       <img
-        class="w-full h-full {shape}"
+        class="h-full w-full {shape}"
         src="https://cdn4.iconfinder.com/data/icons/small-n-flat/24/user-alt-512.png"
         alt=""
       />
@@ -57,7 +60,7 @@
     <button
       class="width-fit text-primary-700 flex flex-col items-center text-sm {isDisabled ||
       isUploading
-        ? 'opacity-50 cursor-not-allowed'
+        ? 'cursor-not-allowed opacity-50'
         : 'cursor-pointer'}"
       on:click={() => {
         if (!isDisabled || isUploading) {
@@ -73,7 +76,7 @@
       {/if}
       <span class="ml-2">{$t('settings.profile.profile_picture.upload_image')}</span>
     </button>
-    <p class="text-xs text-center text-gray-500">
+    <p class="text-center text-xs text-gray-500">
       {$t('settings.profile.profile_picture.file_size')}
       {maxFileSizeInMb}MB<br />
       {$t('settings.profile.profile_picture.accepted')}: jpeg, jpg, png, webp
diff --git a/apps/dashboard/src/lib/utils/translations/de.json b/apps/dashboard/src/lib/utils/translations/de.json
index bab83ef4..be506c9b 100644
--- a/apps/dashboard/src/lib/utils/translations/de.json
+++ b/apps/dashboard/src/lib/utils/translations/de.json
@@ -1553,5 +1553,10 @@
     "assignment_completion_description": "Prozentsatz der abgeschlossenen Aufgaben",
     "average_grade": "Durchschnittsnote",
     "average_grade_description": "Durchschnittsnote aller abgeschlossenen Aufgaben"
+  },
+  "common": {
+    "unsaved_changes": {
+      "message": "Sie haben nicht gerettete Änderungen. Bist du sicher, dass du gehen willst?"
+    }
   }
 }
diff --git a/apps/dashboard/src/lib/utils/translations/en.json b/apps/dashboard/src/lib/utils/translations/en.json
index 0e072c05..262d7070 100644
--- a/apps/dashboard/src/lib/utils/translations/en.json
+++ b/apps/dashboard/src/lib/utils/translations/en.json
@@ -1600,5 +1600,11 @@
       "not_valid": "Not valid email"
     },
     "invalid_type_error": "Must not be empty"
+  },
+
+  "common": {
+    "unsaved_changes": {
+      "message": "You have unsaved changes. Are you sure you want to leave?"
+    }
   }
 }
diff --git a/apps/dashboard/src/lib/utils/translations/es.json b/apps/dashboard/src/lib/utils/translations/es.json
index 71a760cc..50ced1f0 100644
--- a/apps/dashboard/src/lib/utils/translations/es.json
+++ b/apps/dashboard/src/lib/utils/translations/es.json
@@ -1553,5 +1553,10 @@
     "assignment_completion_description": "Porcentaje de tareas completadas",
     "average_grade": "Calificación promedio",
     "average_grade_description": "Calificación promedio de todas las tareas completadas"
+  },
+  "common": {
+    "unsaved_changes": {
+      "message": "Tienes cambios no salvos. ¿Estás seguro de que quieres irte?"
+    }
   }
 }
diff --git a/apps/dashboard/src/lib/utils/translations/fr.json b/apps/dashboard/src/lib/utils/translations/fr.json
index afd0ee5a..9565a1a5 100644
--- a/apps/dashboard/src/lib/utils/translations/fr.json
+++ b/apps/dashboard/src/lib/utils/translations/fr.json
@@ -1553,5 +1553,10 @@
     "assignment_completion_description": "Pourcentage de missions terminées",
     "average_grade": "Note moyenne",
     "average_grade_description": "Note moyenne de tous les devoirs terminés"
+  },
+  "common": {
+    "unsaved_changes": {
+      "message": "Vous avez des changements non sauvés. Êtes-vous sûr de vouloir partir?"
+    }
   }
 }
\ No newline at end of file
diff --git a/apps/dashboard/src/lib/utils/translations/hi.json b/apps/dashboard/src/lib/utils/translations/hi.json
index 75b5c42e..30039776 100644
--- a/apps/dashboard/src/lib/utils/translations/hi.json
+++ b/apps/dashboard/src/lib/utils/translations/hi.json
@@ -1553,5 +1553,10 @@
     "assignment_completion_description": "पूर्ण किये गये कार्यों का प्रतिशत",
     "average_grade": "औसत क्षेणी",
     "average_grade_description": "सभी पूर्ण किए गए असाइनमेंट का औसत ग्रेड"
+  },
+  "common": {
+    "unsaved_changes": {
+      "message": "आपके पास अनसुना परिवर्तन हैं। क्या आपकी वाकई छोड़ने की इच्छा है?"
+    }
   }
 }
diff --git a/apps/dashboard/src/lib/utils/translations/pt.json b/apps/dashboard/src/lib/utils/translations/pt.json
index 41d7b808..fd519d36 100644
--- a/apps/dashboard/src/lib/utils/translations/pt.json
+++ b/apps/dashboard/src/lib/utils/translations/pt.json
@@ -1553,5 +1553,10 @@
     "assignment_completion_description": "Porcentagem de tarefas concluídas",
     "average_grade": "Nota Média",
     "average_grade_description": "Nota média de todas as tarefas concluídas"
+  },
+  "common": {
+    "unsaved_changes": {
+      "message": "Você tem mudanças não salvas. Tem certeza de que deseja sair?"
+    }
   }
 }
diff --git a/apps/dashboard/src/lib/utils/translations/ru.json b/apps/dashboard/src/lib/utils/translations/ru.json
index 1606acff..ea5ed953 100644
--- a/apps/dashboard/src/lib/utils/translations/ru.json
+++ b/apps/dashboard/src/lib/utils/translations/ru.json
@@ -1553,5 +1553,10 @@
     "assignment_completion_description": "Процент выполненных заданий",
     "average_grade": "Средняя оценка",
     "average_grade_description": "Средняя оценка за все выполненные задания"
+  },
+  "common": {
+    "unsaved_changes": {
+      "message": "У вас есть неспасенные изменения. Вы уверены, что хотите уйти?"
+    }
   }
 }
\ No newline at end of file
diff --git a/apps/dashboard/src/lib/utils/translations/vi.json b/apps/dashboard/src/lib/utils/translations/vi.json
index 960a1fb8..8587c999 100644
--- a/apps/dashboard/src/lib/utils/translations/vi.json
+++ b/apps/dashboard/src/lib/utils/translations/vi.json
@@ -1553,5 +1553,10 @@
     "assignment_completion_description": "Tỷ lệ bài tập đã hoàn thành",
     "average_grade": "Điểm trung bình",
     "average_grade_description": "Điểm trung bình của tất cả các bài tập đã hoàn thành"
+  },
+  "common": {
+    "unsaved_changes": {
+      "message": "Bạn có những thay đổi chưa được lưu. Bạn có chắc bạn muốn rời đi?"
+    }
   }
 }