diff --git a/frontend/src/components/NewDeal.vue b/frontend/src/components/NewDeal.vue
index 363a1532..a4b3dbdb 100644
--- a/frontend/src/components/NewDeal.vue
+++ b/frontend/src/components/NewDeal.vue
@@ -84,7 +84,7 @@ import { dealStatuses, statusDropdownOptions, activeAgents } from '@/utils'
 import { FormControl, Button, Dropdown, FeatherIcon } from 'frappe-ui'
 
 const { getUser } = usersStore()
-const { organizationOptions } = organizationsStore()
+const { getOrganizationOptions } = organizationsStore()
 
 const props = defineProps({
   newDeal: {
@@ -146,7 +146,7 @@ const allFields = [
         name: 'organization',
         type: 'link',
         placeholder: 'Organization',
-        options: organizationOptions,
+        options: getOrganizationOptions(),
         change: (option) => {
           newDeal.organization = option.name
         },
diff --git a/frontend/src/components/NewLead.vue b/frontend/src/components/NewLead.vue
index 7d2bc910..aa48d65f 100644
--- a/frontend/src/components/NewLead.vue
+++ b/frontend/src/components/NewLead.vue
@@ -84,7 +84,7 @@ import { leadStatuses, statusDropdownOptions, activeAgents } from '@/utils'
 import { FormControl, Button, Dropdown, FeatherIcon } from 'frappe-ui'
 
 const { getUser } = usersStore()
-const { organizationOptions } = organizationsStore()
+const { getOrganizationOptions } = organizationsStore()
 
 const props = defineProps({
   newLead: {
@@ -146,7 +146,7 @@ const allFields = [
         name: 'organization',
         type: 'link',
         placeholder: 'Organization',
-        options: organizationOptions,
+        options: getOrganizationOptions(),
         change: (option) => {
           newLead.organization = option.name
         },
diff --git a/frontend/src/pages/Contact.vue b/frontend/src/pages/Contact.vue
index a69b3b89..871fd14c 100644
--- a/frontend/src/pages/Contact.vue
+++ b/frontend/src/pages/Contact.vue
@@ -221,7 +221,7 @@ import { ref, computed, h } from 'vue'
 
 const { getContactByName, contacts } = contactsStore()
 const { getUser } = usersStore()
-const { getOrganization, organizationOptions } = organizationsStore()
+const { getOrganization, getOrganizationOptions } = organizationsStore()
 
 const showContactModal = ref(false)
 
@@ -537,7 +537,7 @@ const details = computed(() => {
       type: 'link',
       name: 'company_name',
       placeholder: 'Select organization',
-      options: organizationOptions,
+      options: getOrganizationOptions(),
       change: (data) => {
         contact.value.company_name = data.value
         updateContact('company_name', data.value)
diff --git a/frontend/src/pages/Deal.vue b/frontend/src/pages/Deal.vue
index b4e2f44c..0209e658 100644
--- a/frontend/src/pages/Deal.vue
+++ b/frontend/src/pages/Deal.vue
@@ -54,14 +54,14 @@
           <Avatar
             size="3xl"
             class="h-[88px] w-[88px]"
-            :label="organization.name"
-            :image="deal.data.organization_logo"
+            :label="organization?.name"
+            :image="organization?.organization_logo"
           />
         </Tooltip>
         <div class="flex flex-col gap-2.5 truncate">
-          <Tooltip :text="organization.name">
+          <Tooltip :text="organization?.name">
             <div class="truncate text-2xl font-medium">
-              {{ organization.name }}
+              {{ organization?.name }}
             </div>
           </Tooltip>
           <div class="flex gap-1.5">
@@ -85,7 +85,6 @@
               </Button>
             </Tooltip>
           </div>
-          <ErrorMessage :message="error" />
         </div>
       </div>
       <div class="flex flex-1 flex-col justify-between overflow-hidden">
@@ -313,7 +312,6 @@ import { organizationsStore } from '@/stores/organizations'
 import {
   createResource,
   FeatherIcon,
-  ErrorMessage,
   FormControl,
   Dropdown,
   Tooltip,
@@ -326,7 +324,7 @@ import { useRouter } from 'vue-router'
 
 const { getUser } = usersStore()
 const { contacts } = contactsStore()
-const { getOrganization, organizationOptions } = organizationsStore()
+const { getOrganization, getOrganizationOptions } = organizationsStore()
 const router = useRouter()
 
 const props = defineProps({
@@ -420,7 +418,7 @@ const detailSections = computed(() => {
           type: 'link',
           name: 'organization',
           placeholder: 'Select organization',
-          options: organizationOptions,
+          options: getOrganizationOptions(),
           change: (data) => {
             deal.data.organization = data.value
             updateDeal('organization', data.value)
diff --git a/frontend/src/pages/Lead.vue b/frontend/src/pages/Lead.vue
index 8dd7dc98..a17e48a8 100644
--- a/frontend/src/pages/Lead.vue
+++ b/frontend/src/pages/Lead.vue
@@ -325,7 +325,6 @@ import {
   FileUploader,
   ErrorMessage,
   FeatherIcon,
-  Autocomplete,
   FormControl,
   Dropdown,
   Tooltip,
@@ -338,7 +337,7 @@ import { useRouter } from 'vue-router'
 
 const { getUser } = usersStore()
 const { contacts } = contactsStore()
-const { getOrganization, organizationOptions } = organizationsStore()
+const { getOrganization, getOrganizationOptions } = organizationsStore()
 const router = useRouter()
 
 const props = defineProps({
@@ -447,7 +446,7 @@ const detailSections = computed(() => {
           type: 'link',
           name: 'organization',
           placeholder: 'Select organization',
-          options: organizationOptions,
+          options: getOrganizationOptions(),
           change: (data) => {
             lead.data.organization = data.value
             updateLead('organization', data.value)
diff --git a/frontend/src/stores/organizations.js b/frontend/src/stores/organizations.js
index 9e82b0b3..302b2c76 100644
--- a/frontend/src/stores/organizations.js
+++ b/frontend/src/stores/organizations.js
@@ -27,7 +27,7 @@ export const organizationsStore = defineStore('crm-organizations', () => {
     return organizationsByName[name]
   }
 
-  const organizationOptions = computed(() => {
+  function getOrganizationOptions() {
     return [
       { label: '', value: '' },
       ...organizations.data?.map((org) => ({
@@ -35,11 +35,11 @@ export const organizationsStore = defineStore('crm-organizations', () => {
         value: org.name,
       })),
     ]
-  })
+  }
 
   return {
     organizations,
-    organizationOptions,
+    getOrganizationOptions,
     getOrganization,
   }
 })