diff --git a/frontend/README.md b/frontend/README.md
index b6d2e17..66a31e6 100644
--- a/frontend/README.md
+++ b/frontend/README.md
@@ -1,4 +1,4 @@
-# LibreDesk frontend
+# Libredesk frontend
 
 This template should help get you started developing with Vue 3 in Vite.
 
diff --git a/frontend/src/features/conversation/sidebar/ConversationInfo.vue b/frontend/src/features/conversation/sidebar/ConversationInfo.vue
index 237acb2..09c558f 100644
--- a/frontend/src/features/conversation/sidebar/ConversationInfo.vue
+++ b/frontend/src/features/conversation/sidebar/ConversationInfo.vue
@@ -17,9 +17,10 @@
   <div class="flex flex-col gap-1 mb-5">
     <p class="font-medium">Initiated at</p>
     <Skeleton v-if="conversationStore.conversation.loading" class="w-32 h-4" />
-    <p v-else>
+    <p v-if="conversation.created_at">
       {{ format(conversation.created_at, 'PPpp') }}
     </p>
+    <p v-else>-</p>
   </div>
 
   <div class="flex flex-col gap-1 mb-5">
diff --git a/frontend/src/features/conversation/sidebar/ConversationSideBar.vue b/frontend/src/features/conversation/sidebar/ConversationSideBar.vue
index 10d0b43..5428ab2 100644
--- a/frontend/src/features/conversation/sidebar/ConversationSideBar.vue
+++ b/frontend/src/features/conversation/sidebar/ConversationSideBar.vue
@@ -115,6 +115,7 @@
           </ComboBox>
 
           <SelectTag
+            v-if="conversationStore.current"
             v-model="conversationStore.current.tags"
             :items="tags"
             placeholder="Select tags"
@@ -138,8 +139,8 @@
         <AccordionContent class="p-4">
           <div
             v-if="
-              conversationStore.current.previous_conversations.length === 0 ||
-              conversationStore.conversation.loading
+              conversationStore.current?.previous_conversations?.length === 0 ||
+              conversationStore.conversation?.loading
             "
             class="text-center text-sm text-muted-foreground py-4"
           >
@@ -206,15 +207,35 @@ const conversationStore = useConversationStore()
 const usersStore = useUsersStore()
 const teamsStore = useTeamStore()
 const tags = ref([])
+let isConversationChange = false
+
+// Watch for changes in the current conversation and set the flag
+watch(
+  () => conversationStore.current,
+  (newConversation, oldConversation) => {
+    // Set the flag when the conversation changes
+    if (newConversation?.uuid !== oldConversation?.uuid) {
+      isConversationChange = true
+    }
+  },
+  { immediate: true }
+)
 
 onMounted(async () => {
   await fetchTags()
 })
 
+// Watch for changes in the tags and upsert the tags
 watch(
   () => conversationStore.current?.tags,
   (newTags, oldTags) => {
-    // Check if the tags are the same.
+    // Skip if the tags change is due to a conversation change.
+    if (isConversationChange) {
+      isConversationChange = false
+      return
+    }
+
+    // Skip if the tags are the same (deep comparison)
     if (
       Array.isArray(newTags) &&
       Array.isArray(oldTags) &&
diff --git a/frontend/src/features/conversation/sidebar/ConversationSideBarContact.vue b/frontend/src/features/conversation/sidebar/ConversationSideBarContact.vue
index 97d09e1..41fe2f2 100644
--- a/frontend/src/features/conversation/sidebar/ConversationSideBarContact.vue
+++ b/frontend/src/features/conversation/sidebar/ConversationSideBarContact.vue
@@ -31,7 +31,7 @@
           <Skeleton class="w-32 h-4" />
         </span>
         <span v-else>
-          {{ conversation.contact.email }}
+          {{ conversation?.contact?.email }}
         </span>
       </p>
       <p class="text-sm text-muted-foreground flex gap-2 mt-1">
diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js
index 6c0b815..da05be9 100644
--- a/frontend/src/router/index.js
+++ b/frontend/src/router/index.js
@@ -437,7 +437,7 @@ const router = createRouter({
 })
 
 router.beforeEach((to, from, next) => {
-  document.title = to.meta.title + ' - LibreDesk'
+  document.title = to.meta.title + ' - Libredesk'
   next()
 })
 
diff --git a/frontend/src/stores/conversation.js b/frontend/src/stores/conversation.js
index 204eed1..4723fd1 100644
--- a/frontend/src/stores/conversation.js
+++ b/frontend/src/stores/conversation.js
@@ -185,6 +185,7 @@ export const useConversationStore = defineStore('conversation', () => {
 
   const conversationsList = computed(() => {
     if (!conversations.data) return []
+    // Sort conversations based on the selected sort field
     return [...conversations.data].sort((a, b) => {
       const field = sortFieldMap[conversations.sortField]?.field
       if (!a[field] && !b[field]) return 0
@@ -223,7 +224,7 @@ export const useConversationStore = defineStore('conversation', () => {
   }
 
   const current = computed(() => {
-    return conversation.data
+    return conversation.data || {}
   })
 
   const currentBCC = computed(() => {
diff --git a/frontend/src/views/login/UserLoginView.vue b/frontend/src/views/login/UserLoginView.vue
index 0801f29..7eb0b84 100644
--- a/frontend/src/views/login/UserLoginView.vue
+++ b/frontend/src/views/login/UserLoginView.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="min-h-screen flex flex-col bg-background">
     <header class="p-6">
-      <h1 class="text-2xl font-bold text-foreground">LibreDesk</h1>
+      <h1 class="text-2xl font-bold text-foreground">Libredesk</h1>
     </header>
 
     <main class="flex-1 flex items-center justify-center p-4">
@@ -13,7 +13,7 @@
         >
           <CardContent class="p-8 space-y-6">
             <div class="space-y-2 text-center">
-              <CardTitle class="text-3xl font-bold text-foreground">LibreDesk</CardTitle>
+              <CardTitle class="text-3xl font-bold text-foreground">Libredesk</CardTitle>
               <p class="text-muted-foreground">Sign in to your account</p>
             </div>
 
diff --git a/frontend/src/views/outerapp/ResetPasswordView.vue b/frontend/src/views/outerapp/ResetPasswordView.vue
index 0851832..4bc6808 100644
--- a/frontend/src/views/outerapp/ResetPasswordView.vue
+++ b/frontend/src/views/outerapp/ResetPasswordView.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="min-h-screen flex flex-col bg-background">
     <header class="p-6">
-      <h1 class="text-2xl font-bold text-foreground">LibreDesk</h1>
+      <h1 class="text-2xl font-bold text-foreground">Libredesk</h1>
     </header>
 
     <main class="flex-1 flex items-center justify-center p-4">
diff --git a/frontend/src/views/outerapp/SetPasswordView.vue b/frontend/src/views/outerapp/SetPasswordView.vue
index 502f3c4..069166d 100644
--- a/frontend/src/views/outerapp/SetPasswordView.vue
+++ b/frontend/src/views/outerapp/SetPasswordView.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="min-h-screen flex flex-col bg-background">
     <header class="p-6">
-      <h1 class="text-2xl font-bold text-foreground">LibreDesk</h1>
+      <h1 class="text-2xl font-bold text-foreground">Libredesk</h1>
     </header>
 
     <main class="flex-1 flex items-center justify-center p-4">
diff --git a/schema.sql b/schema.sql
index 67f2b03..80af686 100644
--- a/schema.sql
+++ b/schema.sql
@@ -485,7 +485,7 @@ VALUES
     ('app.lang', '"en"'::jsonb),
     ('app.root_url', '"http://localhost:9000"'::jsonb),
     ('app.logo_url', '"http://localhost:9000/logo.png"'::jsonb),
-    ('app.site_name', '"LibreDesk"'::jsonb),
+    ('app.site_name', '"Libredesk"'::jsonb),
     ('app.favicon_url', '"http://localhost:9000/favicon.ico"'::jsonb),
     ('app.max_file_upload_size', '20'::jsonb),
     ('app.allowed_file_upload_extensions', '["*"]'::jsonb),
@@ -557,5 +557,5 @@ VALUES('email_notification'::public."template_type", '<p>Hello {{ .agent.full_na
 
 <div >
     Best regards,<br>
-    LibreDesk
+    Libredesk
 </div>', false, 'Conversation assigned', 'New conversation assigned to you', true);
\ No newline at end of file
diff --git a/static/public/web-templates/index.html b/static/public/web-templates/index.html
index 1c0b33d..ece2456 100644
--- a/static/public/web-templates/index.html
+++ b/static/public/web-templates/index.html
@@ -31,7 +31,7 @@
 {{ define "footer" }}
 	</div>
 	<footer class="container">
-		Powered by <a target="_blank" rel="noreferrer" href="https://libredesk.io/">LibreDesk</a>
+		Powered by <a target="_blank" rel="noreferrer" href="https://libredesk.io/">Libredesk</a>
 	</footer>
 </body>
 </html>