diff --git a/README.md b/README.md
index c0642cfae..c38e50521 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 <img src=".github/hd-logo.svg" alt="Frappe Helpdesk logo" width="100"/>
 <h1>Frappe Helpdesk</h1>
 
-**Open Source Business Intelligence Tool**
+**Customer Service, Made Simple and Effective**
 
 ![GitHub release (latest by date)](https://img.shields.io/github/v/release/frappe/helpdesk)
 [![codecov](https://codecov.io/github/frappe/helpdesk/branch/develop/graph/badge.svg?token=8ZXHCY4G9U)](https://codecov.io/github/frappe/helpdesk)
@@ -27,7 +27,7 @@ Frappe Helpdesk is an 100% open-source Ticket Management tool which helps you  s
 
 
 ## Motivation
-Managing issues from our customers was a big challenge for us. We were using the ERPNext support module which was not very good in UI and the UX was also not good. We wanted to have a tool that can be easily integrated with our existing system and can be customized as per our needs. So we decided to build a Helpdesk tool that can be easily integrated with our existing system and can be customized as per our needs.
+Managing issues from our customers was a big challenge for us. We were using the ERPNext support module which was not very good in UI and the UX was also not good. We wanted to have a tool that can be easily integrated with our existing system and can be customized as per our needs. So we decided to build Frappe Helpdesk.
 
 ## Key Features
 
@@ -45,15 +45,6 @@ Managing issues from our customers was a big challenge for us. We were using the
 
 
 
-<details>
-<summary>Screenshots</summary>
-
-![Helpdesk SS1](.github/query-builder.png)
-![Helpdesk SS1](.github/join-editor.png)
-![Helpdesk SS1](.github/chart-builder.png)
-</details>
-
-
 ## Under the Hood
 
 - [**Frappe Framework**](https://github.com/frappe/frappe): A full-stack web application framework written in Python and Javascript. The framework provides a robust foundation for building web applications, including a database abstraction layer, user authentication, and a REST API.
@@ -148,9 +139,9 @@ To setup the repository locally follow the steps mentioned below:
 - [Telegram Public Group](https://t.me/frappedesk)
 - [Discuss Forum](https://discuss.frappe.io/c/frappehelpdesk/69)
 - [Documentation](https://docs.frappe.io/helpdesk)
-- [YouTube]([https://frappe.io](https://www.youtube.com/@frappetech))
 
 <h2></h2>
+<br>
 <div align="center" style="padding-top: 0.75rem;">
 	<a href="https://frappe.io" target="_blank">
 		<picture>
diff --git a/desk/src/App.vue b/desk/src/App.vue
index 826a185b7..4d0c467f1 100644
--- a/desk/src/App.vue
+++ b/desk/src/App.vue
@@ -1,5 +1,5 @@
 <template>
-  <RouterView class="antialiased" />
+  <RouterView class="antialiased" :key="$route.fullPath" />
   <Toasts />
   <KeymapDialog />
   <Dialogs />
@@ -11,7 +11,7 @@ import { Toasts } from "frappe-ui";
 import { createToast } from "@/utils";
 import { useConfigStore } from "@/stores/config";
 import KeymapDialog from "@/pages/KeymapDialog.vue";
-import { init as initTelemetry, stopSession } from "@/telemetry";
+import { stopSession } from "@/telemetry";
 import { Dialogs } from "frappe-ui";
 useConfigStore();
 
diff --git a/desk/src/components/EmptyState.vue b/desk/src/components/EmptyState.vue
new file mode 100644
index 000000000..54b1008e3
--- /dev/null
+++ b/desk/src/components/EmptyState.vue
@@ -0,0 +1,33 @@
+<template>
+  <div class="flex h-full items-center justify-center">
+    <div
+      class="flex flex-col items-center gap-3 text-xl font-medium text-ink-gray-4"
+    >
+      <!-- Icon -->
+      <component v-if="icon" :is="icon" class="h-10 w-10" />
+      <!-- title -->
+      <span>{{ title }}</span>
+      <!-- Button which emits Empty State Action -->
+      <Button label="Create" @click="emit('emptyStateAction')" variant="subtle">
+        <template #prefix><FeatherIcon name="plus" class="h-4" /></template>
+      </Button>
+    </div>
+  </div>
+</template>
+
+<script setup>
+defineProps({
+  title: {
+    type: String,
+    default: "No Data Found",
+  },
+  icon: {
+    type: String || HTMLElement,
+    default: "",
+  },
+});
+
+const emit = defineEmits(["emptyStateAction"]);
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/desk/src/components/ListViewBuilder.vue b/desk/src/components/ListViewBuilder.vue
index 03b2680f7..a08c9a581 100644
--- a/desk/src/components/ListViewBuilder.vue
+++ b/desk/src/components/ListViewBuilder.vue
@@ -91,20 +91,11 @@
     />
   </div>
   <!-- Empty State -->
-  <div v-else class="flex h-full items-center justify-center">
-    <div
-      class="flex flex-col items-center gap-3 text-xl font-medium text-ink-gray-4"
-    >
-      <!-- Icon -->
-      <component :is="emptyState.icon" class="h-10 w-10" />
-      <!-- title -->
-      <span>{{ emptyState.title || "No Data Found" }}</span>
-      <!-- Button which emits Empty State Action -->
-      <Button label="Create" @click="emit('emptyStateAction')" variant="subtle">
-        <template #prefix><FeatherIcon name="plus" class="h-4" /></template>
-      </Button>
-    </div>
-  </div>
+  <EmptyState
+    v-else
+    :title="emptyState.title"
+    @emptyStateAction="emit('emptyStateAction')"
+  />
 </template>
 
 <script setup lang="ts">
@@ -124,6 +115,7 @@ import { dayjs } from "@/dayjs";
 import FadedScrollableDiv from "./FadedScrollableDiv.vue";
 import Reload from "./view-controls/Reload.vue";
 import { useScreenSize } from "@/composables/screen";
+import EmptyState from "./EmptyState.vue";
 
 interface P {
   options: {
diff --git a/desk/src/components/desk/global/AddNewAgentsDialog.vue b/desk/src/components/desk/global/AddNewAgentsDialog.vue
index 5e6a8e276..6f04116d5 100644
--- a/desk/src/components/desk/global/AddNewAgentsDialog.vue
+++ b/desk/src/components/desk/global/AddNewAgentsDialog.vue
@@ -66,7 +66,7 @@
         <Button appearance="secondary" class="mr-2" @click="close()"
           >Cancel</Button
         >
-        <div class="grow">
+        <div class="grow mt-2">
           <Button
             @click="removeAllEmailFromQueue()"
             v-if="inviteQueue.length > 1"
diff --git a/desk/src/components/layouts/Sidebar.vue b/desk/src/components/layouts/Sidebar.vue
index d4be27d06..9d3d1061b 100644
--- a/desk/src/components/layouts/Sidebar.vue
+++ b/desk/src/components/layouts/Sidebar.vue
@@ -138,6 +138,7 @@ const agentPortalDropdown = computed(() => [
     label: "Settings",
     icon: "settings",
     onClick: () => (showSettingsModal.value = true),
+    condition: () => authStore.isAdmin,
   },
   {
     label: "Log out",
diff --git a/desk/src/components/ticket/TicketCustomerSidebar.vue b/desk/src/components/ticket/TicketCustomerSidebar.vue
index 3dea79799..6226e8bab 100644
--- a/desk/src/components/ticket/TicketCustomerSidebar.vue
+++ b/desk/src/components/ticket/TicketCustomerSidebar.vue
@@ -35,7 +35,7 @@
         v-for="field in ticketBasicInfo"
       >
         <span class="w-[126px] text-sm text-gray-600">{{ field.label }}</span>
-        <span class="text-base text-gray-800">
+        <span class="text-base text-gray-800 flex-1">
           {{ field.value }}
         </span>
       </div>
@@ -67,7 +67,7 @@
         v-for="field in ticketAdditionalInfo"
       >
         <span class="w-[126px] text-sm text-gray-600">{{ field.label }}</span>
-        <span class="text-base text-gray-800">
+        <span class="text-base text-gray-800 flex-1">
           {{ field.value }}
         </span>
       </div>
diff --git a/desk/src/components/ticket/TicketsListView.vue b/desk/src/components/ticket/TicketsListView.vue
index 05e8f9614..8b4f93f30 100644
--- a/desk/src/components/ticket/TicketsListView.vue
+++ b/desk/src/components/ticket/TicketsListView.vue
@@ -71,7 +71,7 @@
               {{ dayjs.tz(item).fromNow() }}
             </Tooltip>
           </div>
-          <div v-else-if="column.key === 'agent_group'">
+          <div v-else-if="column.key === 'agent_group'" class="truncate">
             {{ item || "-" }}
           </div>
           <div v-else-if="column.key === 'resolution_by'">
diff --git a/desk/src/pages/CannedResponses.vue b/desk/src/pages/CannedResponses.vue
index 9bb1e3699..2f7aebf1e 100644
--- a/desk/src/pages/CannedResponses.vue
+++ b/desk/src/pages/CannedResponses.vue
@@ -25,7 +25,7 @@
     </LayoutHeader>
     <div class="flex-1 overflow-y-auto p-2">
       <div
-        v-if="!cannedResponses.loading"
+        v-if="cannedResponses.data?.length > 0"
         class="grid grid-cols-1 md:grid-cols-3 lg:grid-cols-4 gap-4 px-5 pb-3"
       >
         <div
@@ -79,6 +79,11 @@
           </div>
         </div>
       </div>
+      <EmptyState
+        v-else
+        title="No Canned Responses Found"
+        @emptyStateAction="showNewDialog = true"
+      />
     </div>
     <CannedResponseModal
       v-model="showNewDialog"
@@ -122,6 +127,7 @@ import { LayoutHeader } from "@/components";
 import { useUserStore } from "@/stores/user";
 import { dateFormat, dateTooltipFormat } from "@/utils";
 import { dayjs } from "@/dayjs";
+import EmptyState from "../components/EmptyState.vue";
 
 const { getUser } = useUserStore();
 
diff --git a/desk/src/pages/KnowledgeBaseArticle.vue b/desk/src/pages/KnowledgeBaseArticle.vue
index 744f209a9..5b808bef4 100644
--- a/desk/src/pages/KnowledgeBaseArticle.vue
+++ b/desk/src/pages/KnowledgeBaseArticle.vue
@@ -347,6 +347,10 @@ const insertRes = createResource({
       params: {
         articleId: data.name,
       },
+      query: {
+        category: categoryId.value,
+        subCategory: subCategoryId.value,
+      },
     });
   },
   onError: useError({ title: "Error creating article" }),
diff --git a/desk/src/pages/desk/AgentRoot.vue b/desk/src/pages/desk/AgentRoot.vue
index d9c90c15f..968a19443 100644
--- a/desk/src/pages/desk/AgentRoot.vue
+++ b/desk/src/pages/desk/AgentRoot.vue
@@ -9,7 +9,7 @@ import { computed, defineAsyncComponent, onBeforeMount } from "vue";
 import { useRouter } from "vue-router";
 import { useAuthStore } from "@/stores/auth";
 import { useConfigStore } from "@/stores/config";
-import { CUSTOMER_PORTAL_LANDING, ONBOARDING_PAGE } from "@/router";
+import { CUSTOMER_PORTAL_LANDING } from "@/router";
 
 import { useScreenSize } from "@/composables/screen";
 const router = useRouter();
@@ -37,9 +37,5 @@ onBeforeMount(() => {
   if (!authStore.hasDeskAccess) {
     router.replace({ name: CUSTOMER_PORTAL_LANDING });
   }
-
-  if (!configStore.isSetupComplete) {
-    router.replace({ name: ONBOARDING_PAGE });
-  }
 });
 </script>
diff --git a/desk/src/pages/onboarding/OnboardingIntro.vue b/desk/src/pages/onboarding/OnboardingIntro.vue
deleted file mode 100644
index 3bd7deb39..000000000
--- a/desk/src/pages/onboarding/OnboardingIntro.vue
+++ /dev/null
@@ -1,24 +0,0 @@
-<template>
-  <div class="flex flex-col gap-2 text-gray-800">
-    <div class="text-base text-gray-900">
-      {{ text }}
-    </div>
-    <div class="text-base text-gray-900">
-      {{ subText }}
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { onMounted } from "vue";
-import { capture } from "@/telemetry";
-
-const text =
-  "We're excited to have you join us and explore the world of efficient customer support. \
-	We are here to transform the way you handle customer inquiries, streamline ticket \
-	management, and deliver outstanding service.";
-const subText =
-  "Once again, welcome to Frappe Helpdesk! Let's hope for a long and smooth journey!";
-
-onMounted(() => capture("onboarding_started"));
-</script>
diff --git a/desk/src/pages/onboarding/SetupFavicon.vue b/desk/src/pages/onboarding/SetupFavicon.vue
deleted file mode 100644
index e5bed294b..000000000
--- a/desk/src/pages/onboarding/SetupFavicon.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-<template>
-  <div class="flex flex-col gap-4">
-    <div class="text-gray-700">
-      {{ help }}
-    </div>
-    <img v-if="imageUrl" class="m-auto h-8 w-8" :src="imageUrl" />
-    <FileUploader @success="(file) => update(file)">
-      <template #default="{ error, openFileSelector }">
-        <span>
-          <Button
-            label="Upload Favicon"
-            :loading="r.loading"
-            class="w-max"
-            variant="outline"
-            @click="openFileSelector"
-          />
-          <ErrorMessage class="mt-2" :message="error" />
-        </span>
-      </template>
-    </FileUploader>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { Ref, onMounted, ref } from "vue";
-import { createResource, FileUploader } from "frappe-ui";
-import { capture } from "@/telemetry";
-
-const help =
-  "A favicon enhances your website by providing a small, recognizable icon that \
-	appears in browser tabs. It improves brand recognition, adds professionalism, \
-	aids navigation, establishes trust, and maintains brand consistency";
-const imageUrl: Ref<string> = ref(null);
-
-const r = createResource({
-  url: "frappe.client.set_value",
-  debounce: 1000,
-  onSuccess(data) {
-    imageUrl.value = data.brand_favicon;
-    capture("onboarding_favicon_changed");
-  },
-});
-
-function update(file) {
-  r.submit({
-    doctype: "HD Settings",
-    name: "HD Settings",
-    fieldname: "brand_favicon",
-    value: file.file_url,
-  });
-}
-
-onMounted(() => capture("onboarding_favicon_reached"));
-</script>
diff --git a/desk/src/pages/onboarding/SetupLogo.vue b/desk/src/pages/onboarding/SetupLogo.vue
deleted file mode 100644
index d5c0dee76..000000000
--- a/desk/src/pages/onboarding/SetupLogo.vue
+++ /dev/null
@@ -1,53 +0,0 @@
-<template>
-  <div class="flex flex-col gap-4">
-    <div class="text-gray-700">
-      {{ help }}
-    </div>
-    <img v-if="imageUrl" class="m-auto h-8" :src="imageUrl" />
-    <FileUploader @success="(file) => update(file)">
-      <template #default="{ error, openFileSelector }">
-        <span>
-          <Button
-            label="Upload Logo"
-            :loading="r.loading"
-            class="w-max"
-            variant="outline"
-            @click="openFileSelector"
-          />
-          <ErrorMessage class="mt-2" :message="error" />
-        </span>
-      </template>
-    </FileUploader>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { Ref, onMounted, ref } from "vue";
-import { createResource, FileUploader } from "frappe-ui";
-import { capture } from "@/telemetry";
-
-const help =
-  "this will be used in many places, including login and loading screens. \
-	An image with transparent background and a resolution of 160 x 32 is preferred";
-const imageUrl: Ref<string> = ref(null);
-
-const r = createResource({
-  url: "frappe.client.set_value",
-  debounce: 1000,
-  onSuccess(data) {
-    imageUrl.value = data.brand_logo;
-    capture("onboarding_logo_changed");
-  },
-});
-
-function update(file) {
-  r.submit({
-    doctype: "HD Settings",
-    name: "HD Settings",
-    fieldname: "brand_logo",
-    value: file.file_url,
-  });
-}
-
-onMounted(() => capture("onboarding_logo_reached"));
-</script>
diff --git a/desk/src/pages/onboarding/SetupName.vue b/desk/src/pages/onboarding/SetupName.vue
deleted file mode 100644
index c584f6dd8..000000000
--- a/desk/src/pages/onboarding/SetupName.vue
+++ /dev/null
@@ -1,57 +0,0 @@
-<template>
-  <div class="flex flex-col gap-4 text-gray-800">
-    {{ text }}
-    <div class="relative flex items-center justify-end">
-      <Input
-        type="text"
-        class="w-full"
-        :placeholder="placeholder"
-        @input="update"
-      />
-      <IconCheck
-        v-if="isCheckVisible"
-        class="absolute mr-2 w-6 text-green-500"
-      />
-    </div>
-    <div class="italic text-gray-800">
-      {{ subText }}
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { onMounted, ref } from "vue";
-import { createResource } from "frappe-ui";
-import { capture } from "@/telemetry";
-import IconCheck from "~icons/ph/check-bold";
-
-const text =
-  "Now, let's set a name for your Helpdesk that reflects your organization's \
-	identity and values. So, what would you like to name your Helpdesk?";
-const subText =
-  "Choose a name that resonates with your brand and instills \
-	trust in your customers";
-const placeholder = "My Helpdesk";
-const isCheckVisible = ref(false);
-
-const r = createResource({
-  url: "frappe.client.set_value",
-  debounce: 1000,
-  onSuccess() {
-    isCheckVisible.value = true;
-    capture("onboarding_name_changed");
-  },
-});
-
-function update(value: string) {
-  isCheckVisible.value = false;
-  r.submit({
-    doctype: "HD Settings",
-    name: "HD Settings",
-    fieldname: "helpdesk_name",
-    value,
-  });
-}
-
-onMounted(() => capture("onboarding_name_reached"));
-</script>
diff --git a/desk/src/pages/onboarding/SetupSkipEmail.vue b/desk/src/pages/onboarding/SetupSkipEmail.vue
deleted file mode 100644
index 5855b33ef..000000000
--- a/desk/src/pages/onboarding/SetupSkipEmail.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<template>
-  <div class="flex flex-col gap-4 text-gray-800">
-    {{ query }}
-    <Button
-      :label="isYes ? 'No' : 'Yes'"
-      class="w-max"
-      variant="outline"
-      @click="update(!isYes)"
-    />
-  </div>
-</template>
-
-<script setup lang="ts">
-import { onMounted, ref } from "vue";
-import { createResource, Button } from "frappe-ui";
-import { capture } from "@/telemetry";
-
-const query =
-  "Did you know that our Helpdesk is designed to function independently, \
-	without relying on email? Our customer portal is finely tuned to be a \
-	standalone solution, eliminating the hassle of email setup. Would you \
-	like me to disable the email workflow for you?";
-const isYes = ref(false);
-
-const r = createResource({
-  url: "frappe.client.set_value",
-  debounce: 1000,
-  onSuccess(data) {
-    isYes.value = data.skip_email_workflow;
-    const cond = isYes.value ? "yes" : "no";
-    const event = "onboarding_skip_email_" + cond;
-    capture(event);
-  },
-});
-
-function update(value: boolean) {
-  r.submit({
-    doctype: "HD Settings",
-    name: "HD Settings",
-    fieldname: "skip_email_workflow",
-    value,
-  });
-}
-
-onMounted(() => capture("onboarding_skip_email_reached"));
-</script>
diff --git a/desk/src/pages/onboarding/SimpleOnboarding.vue b/desk/src/pages/onboarding/SimpleOnboarding.vue
deleted file mode 100644
index 7793ad7b6..000000000
--- a/desk/src/pages/onboarding/SimpleOnboarding.vue
+++ /dev/null
@@ -1,131 +0,0 @@
-<template>
-  <div class="flex h-screen w-screen items-center justify-center bg-gray-100">
-    <div class="container-box w-1/3 rounded-xl text-base text-gray-900">
-      <div class="rounded-t-xl bg-white px-8 py-6">
-        <div class="mb-4 text-xl font-semibold">
-          {{ steps[step]["title"] }}
-        </div>
-        <component :is="steps[step]['component']" />
-      </div>
-      <div class="flex justify-end rounded-b-xl bg-gray-200 px-8 py-3">
-        <Button
-          v-for="action in actions"
-          :key="action.label"
-          :label="action.label"
-          :variant="action.variant"
-          @click="action.onClick"
-        />
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { computed, onBeforeMount, ref } from "vue";
-import { useRouter } from "vue-router";
-import { createResource } from "frappe-ui";
-import { useAuthStore } from "@/stores/auth";
-import { useConfigStore } from "@/stores/config";
-import OnboardingIntro from "./OnboardingIntro.vue";
-import SetupEmail from "./email/SetupEmail.vue";
-import SetupFavicon from "./SetupFavicon.vue";
-import SetupLogo from "./SetupLogo.vue";
-import SetupName from "./SetupName.vue";
-import SetupSkipEmail from "./SetupSkipEmail.vue";
-import SuccessMessage from "./SuccessMessage.vue";
-
-const router = useRouter();
-const authStore = useAuthStore();
-const configStore = useConfigStore();
-const step = ref(0);
-const steps = [
-  {
-    title: "Welcome to Frappe Helpdesk! 🎉",
-    component: OnboardingIntro,
-  },
-  {
-    title: "Begin with a name! 🖋️",
-    component: SetupName,
-  },
-  {
-    title: "Let's set a logo 💫",
-    component: SetupLogo,
-  },
-  {
-    title: "How about a Favicon? 🌏",
-    component: SetupFavicon,
-  },
-  {
-    title: "Did you know? 💡",
-    component: SetupSkipEmail,
-  },
-  {
-    title: "Let's setup an email 📬",
-    component: SetupEmail,
-  },
-  {
-    title: "That's it for now! 🙏",
-    component: SuccessMessage,
-  },
-];
-const actions = computed(() =>
-  [
-    {
-      label: "← Previous",
-      appearance: "minimal",
-      variant: "ghost",
-      onClick() {
-        step.value--;
-      },
-      condition: step.value + 1 > 1 && step.value + 1 <= steps.length,
-    },
-    {
-      label: "Next →",
-      appearance: "primary",
-      variant: "solid",
-      onClick() {
-        step.value++;
-      },
-      condition: step.value + 1 < steps.length,
-    },
-    {
-      label: "Finish ✓",
-      variant: "solid",
-      onClick() {
-        finish();
-      },
-      condition: step.value + 1 === steps.length,
-    },
-  ].filter((a) => a.condition)
-);
-
-function finish() {
-  createResource({
-    url: "frappe.client.set_value",
-  })
-    .submit({
-      doctype: "HD Settings",
-      name: "HD Settings",
-      fieldname: "setup_complete",
-      value: true,
-    })
-    .then(redirect);
-}
-
-function redirect() {
-  router.replace({ path: "/" });
-}
-
-onBeforeMount(() => {
-  if (!authStore.hasDeskAccess || configStore.isSetupComplete) {
-    redirect();
-  }
-});
-</script>
-
-<style scoped>
-.container-box {
-  box-shadow: rgba(0, 0, 0, 0.16) 0px 10px 36px 0px,
-    rgba(0, 0, 0, 0.06) 0px 0px 0px 1px;
-}
-</style>
diff --git a/desk/src/pages/onboarding/SuccessMessage.vue b/desk/src/pages/onboarding/SuccessMessage.vue
deleted file mode 100644
index d235dda82..000000000
--- a/desk/src/pages/onboarding/SuccessMessage.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="flex flex-col gap-4">
-    <div>
-      <div class="font-medium">Don't forget to star our GitHub repo</div>
-      <a class="text-sm text-gray-800" :href="github" target="_blank">
-        {{ github }}
-      </a>
-    </div>
-    <div>
-      <div class="font-medium">
-        If you find any bugs, report them at the issue tracker
-      </div>
-      <a class="text-sm text-gray-800" :href="issues" target="_blank">
-        {{ issues }}
-      </a>
-    </div>
-    <div>
-      <div class="font-medium">
-        For any queries or support, reach out to our support portal
-      </div>
-      <a class="text-sm text-gray-800" :href="support" target="_blank">
-        {{ support }}
-      </a>
-    </div>
-    <div>
-      <div class="font-medium">Or via our e-mail</div>
-      <a class="text-sm text-gray-800" :href="'mailto:' + email">
-        {{ email }}
-      </a>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { onMounted } from "vue";
-import { capture } from "@/telemetry";
-
-const github = "https://github.com/frappe/helpdesk";
-const issues = "https://github.com/frappe/helpdesk/issues";
-const support = "https://frappedesk.com/helpdesk";
-const email = "hello@frappe.io";
-
-onMounted(() => capture("onboarding_finished"));
-</script>
diff --git a/desk/src/pages/onboarding/email/EmailCredentials.vue b/desk/src/pages/onboarding/email/EmailCredentials.vue
deleted file mode 100644
index fbe8e7424..000000000
--- a/desk/src/pages/onboarding/email/EmailCredentials.vue
+++ /dev/null
@@ -1,127 +0,0 @@
-<template>
-  <div class="flex flex-col gap-4">
-    <form class="space-y-4" @submit.prevent="submit">
-      <Input
-        v-model="accountName"
-        label="Account name"
-        placeholder="John Doe (Example.com)"
-        type="text"
-        required
-      />
-      <Input
-        v-model="email"
-        label="Email"
-        placeholder="john.doe@example.com"
-        type="email"
-        required
-      />
-      <Input
-        v-model="password"
-        label="Password"
-        placeholder="••••••••"
-        type="password"
-        required
-      />
-    </form>
-    <Button
-      label="Finish!"
-      :disabled="!accountName || !email || !password"
-      :loading="insertRes.loading"
-      class="w-max"
-      variant="outline"
-      @click="submit"
-    />
-  </div>
-</template>
-
-<script setup lang="ts">
-import { onMounted, ref } from "vue";
-import { storeToRefs } from "pinia";
-import { createResource, Button, Input, debounce } from "frappe-ui";
-import { capture } from "@/telemetry";
-import { useError } from "@/composables/error";
-import { useOnboardingEmailStore } from "./data";
-
-const onboardingEmailStore = useOnboardingEmailStore();
-const { next } = onboardingEmailStore;
-const { service } = storeToRefs(onboardingEmailStore);
-const accountName = ref("");
-const email = ref("");
-const password = ref("");
-
-const emailDefaults = {
-  GMail: {
-    email_server: "imap.gmail.com",
-    use_ssl: 1,
-    smtp_server: "smtp.gmail.com",
-  },
-  outlook: {
-    email_server: "imap-mail.outlook.com",
-    use_ssl: 1,
-    smtp_server: "smtp-mail.outlook.com",
-  },
-  Sendgrid: {
-    smtp_server: "smtp.sendgrid.net",
-    smtp_port: 587,
-  },
-  SparkPost: {
-    smtp_server: "smtp.sparkpostmail.com",
-  },
-  Yahoo: {
-    email_server: "imap.mail.yahoo.com",
-    use_ssl: 1,
-    smtp_server: "smtp.mail.yahoo.com",
-    smtp_port: 587,
-  },
-  Yandex: {
-    email_server: "imap.yandex.com",
-    use_ssl: 1,
-    smtp_server: "smtp.yandex.com",
-    smtp_port: 587,
-  },
-};
-
-const insertRes = createResource({
-  url: "frappe.client.insert",
-  onSuccess: () => {
-    capture("onboarding_email_credentials_success");
-    next();
-  },
-  onError: (e) => {
-    useError()(e);
-    capture("onboarding_email_credentials_fail");
-  },
-});
-
-const submit = debounce(() => {
-  insertRes.submit({
-    doc: {
-      doctype: "Email Account",
-      email_account_name: accountName.value,
-      email_id: email.value,
-      password: password.value,
-      enable_incoming: true,
-      enable_outgoing: true,
-      default_incoming: true,
-      default_outgoing: true,
-      email_sync_option: "ALL",
-      initial_sync_count: 100,
-      imap_folder: [
-        {
-          append_to: "HD Ticket",
-          folder_name: "INBOX",
-        },
-      ],
-      create_contact: true,
-      track_email_status: true,
-      service: service.value,
-      use_tls: 1,
-      use_imap: 1,
-      smtp_port: 587,
-      ...emailDefaults[service.value],
-    },
-  });
-}, 500);
-
-onMounted(() => capture("onboarding_email_credentials_reached"));
-</script>
diff --git a/desk/src/pages/onboarding/email/EmailIntro.vue b/desk/src/pages/onboarding/email/EmailIntro.vue
deleted file mode 100644
index 8b6d9a341..000000000
--- a/desk/src/pages/onboarding/email/EmailIntro.vue
+++ /dev/null
@@ -1,21 +0,0 @@
-<template>
-  <div class="flex flex-col gap-4">
-    <div class="text-gray-700">
-      {{ help }}
-    </div>
-    <Button label="Let's go!" variant="outline" class="w-max" @click="next" />
-  </div>
-</template>
-
-<script setup lang="ts">
-import { Button } from "frappe-ui";
-import { useOnboardingEmailStore } from "./data";
-
-const { next } = useOnboardingEmailStore();
-const help =
-  "Did you know that our Helpdesk becomes even more powerful when \
-	integrated with email? With this integration, you can send and \
-	receive emails directly from your Helpdesk inbox. It streamlines \
-	communication and enhances productivity. Would you like assistance \
-	in setting up your email integration now?";
-</script>
diff --git a/desk/src/pages/onboarding/email/SelectService.vue b/desk/src/pages/onboarding/email/SelectService.vue
deleted file mode 100644
index 7ff074c17..000000000
--- a/desk/src/pages/onboarding/email/SelectService.vue
+++ /dev/null
@@ -1,93 +0,0 @@
-<template>
-  <div class="flex flex-col gap-4">
-    <div class="text-gray-700">
-      {{ title }}
-    </div>
-    <div class="grid grid-cols-4 gap-4">
-      <div
-        v-for="s in services"
-        :key="s.name"
-        class="flex h-20 w-20 cursor-pointer items-center justify-center place-self-center rounded-xl bg-gray-100 hover:bg-gray-200"
-        :class="{
-          'ring-2': s.name === service,
-          'ring-gray-300': s.name === service,
-        }"
-        @click="service = s.name"
-      >
-        <Tooltip :text="s.name">
-          <img :src="s.icon" class="h-12 w-12" />
-        </Tooltip>
-      </div>
-    </div>
-    <div
-      v-if="info"
-      class="flex items-center gap-2 rounded-xl p-2 ring-1 ring-gray-200"
-    >
-      <IconAlert class="h-12 w-12 text-blue-500" />
-      <div class="text-xs text-gray-700">
-        {{ info }}
-      </div>
-    </div>
-    <Button
-      label="Continue"
-      :disabled="isEmpty(service)"
-      class="w-max"
-      variant="outline"
-      @click="next"
-    />
-  </div>
-</template>
-
-<script setup lang="ts">
-import { computed, onMounted } from "vue";
-import { storeToRefs } from "pinia";
-import { Button, Tooltip } from "frappe-ui";
-import { isEmpty } from "lodash";
-import { capture } from "@/telemetry";
-import { useOnboardingEmailStore } from "./data";
-import IconAlert from "~icons/espresso/alert-circle";
-import LogoGmail from "@/assets/images/gmail.png";
-import LogoOutlook from "@/assets/images/outlook.png";
-import LogoSendgrid from "@/assets/images/sendgrid.png";
-import LogoSparkpost from "@/assets/images/sparkpost.webp";
-import LogoYahoo from "@/assets/images/yahoo.png";
-import LogoYandex from "@/assets/images/yandex.png";
-
-const onboardingEmailStore = useOnboardingEmailStore();
-const { next } = onboardingEmailStore;
-const { service } = storeToRefs(onboardingEmailStore);
-const title = "Which service do you want to add?";
-const services = [
-  {
-    name: "GMail",
-    icon: LogoGmail,
-    info: "Setting up GMail requires you to enable two factor authentication \
-		and app specific passwords. Read more at https://support.google.com/accounts/answer/185833",
-  },
-  {
-    name: "Outlook",
-    icon: LogoOutlook,
-  },
-  {
-    name: "Sendgrid",
-    icon: LogoSendgrid,
-  },
-  {
-    name: "SparkPost",
-    icon: LogoSparkpost,
-  },
-  {
-    name: "Yahoo",
-    icon: LogoYahoo,
-  },
-  {
-    name: "Yandex",
-    icon: LogoYandex,
-  },
-];
-const info = computed(
-  () => services.find((s) => s.name === service.value)?.info
-);
-
-onMounted(() => capture("onboarding_email_select_service_reached"));
-</script>
diff --git a/desk/src/pages/onboarding/email/SetupEmail.vue b/desk/src/pages/onboarding/email/SetupEmail.vue
deleted file mode 100644
index 3d4938774..000000000
--- a/desk/src/pages/onboarding/email/SetupEmail.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<template>
-  <div class="flex flex-col gap-4">
-    <component :is="steps[step]" />
-  </div>
-</template>
-
-<script setup lang="ts">
-import { onMounted } from "vue";
-import { storeToRefs } from "pinia";
-import { capture } from "@/telemetry";
-import { useOnboardingEmailStore } from "./data";
-import EmailIntro from "./EmailIntro.vue";
-import SelectService from "./SelectService.vue";
-import EmailCredentials from "./EmailCredentials.vue";
-import SuccessMessage from "./SuccessMessage.vue";
-
-const onboardingEmailStore = useOnboardingEmailStore();
-const { step } = storeToRefs(onboardingEmailStore);
-const steps = [EmailIntro, SelectService, EmailCredentials, SuccessMessage];
-
-onMounted(() => capture("onboarding_email_reached"));
-</script>
diff --git a/desk/src/pages/onboarding/email/SuccessMessage.vue b/desk/src/pages/onboarding/email/SuccessMessage.vue
deleted file mode 100644
index 8bf1f6a9a..000000000
--- a/desk/src/pages/onboarding/email/SuccessMessage.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<template>
-  <div class="flex flex-col items-center justify-center gap-4">
-    <div class="text-7xl">
-      {{ emoji }}
-    </div>
-    <div class="text-center text-base italic text-gray-900">
-      {{ message }}
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { onMounted } from "vue";
-import { capture } from "@/telemetry";
-
-const emoji = "✔️";
-const message =
-  "Fantastic! Your email is now active. You are ready unleash true \
-	potential of Frappe Helpdesk!";
-
-onMounted(() => capture("onboarding_email_finished"));
-</script>
diff --git a/desk/src/pages/onboarding/email/data.ts b/desk/src/pages/onboarding/email/data.ts
deleted file mode 100644
index 015271271..000000000
--- a/desk/src/pages/onboarding/email/data.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { ref } from "vue";
-import { defineStore } from "pinia";
-
-export const useOnboardingEmailStore = defineStore("onboarding", () => {
-  const step = ref(0);
-  const service = ref("");
-
-  function next() {
-    step.value++;
-  }
-
-  return {
-    next,
-    service,
-    step,
-  };
-});
diff --git a/desk/src/router/index.ts b/desk/src/router/index.ts
index 9326a567f..68482e4c0 100644
--- a/desk/src/router/index.ts
+++ b/desk/src/router/index.ts
@@ -5,8 +5,6 @@ import { useUserStore } from "@/stores/user";
 import { useScreenSize } from "@/composables/screen";
 const { isMobileView } = useScreenSize();
 
-export const ONBOARDING_PAGE = "Setup";
-
 export const CUSTOMER_PORTAL_NEW_TICKET = "TicketNew";
 export const CUSTOMER_PORTAL_TICKET = "TicketCustomer";
 
@@ -217,11 +215,6 @@ const routes = [
     ],
   },
   // Additonal routes
-  {
-    path: "/onboarding",
-    name: ONBOARDING_PAGE,
-    component: () => import("@/pages/onboarding/SimpleOnboarding.vue"),
-  },
   {
     path: "/:pathMatch(.*)*",
     name: "Invalid Page",
diff --git a/desk/src/stores/config.ts b/desk/src/stores/config.ts
index f2c9064ef..45001005d 100644
--- a/desk/src/stores/config.ts
+++ b/desk/src/stores/config.ts
@@ -11,9 +11,6 @@ export const useConfigStore = defineStore("config", () => {
 
   const config = computed(() => configRes.data || {});
   const brandLogo = computed(() => config.value.brand_logo);
-  const isSetupComplete: ComputedRef<boolean> = computed(
-    () => !!parseInt(config.value.setup_complete)
-  );
   const skipEmailWorkflow: ComputedRef<boolean> = computed(
     () => !!parseInt(config.value.skip_email_workflow)
   );
@@ -30,7 +27,6 @@ export const useConfigStore = defineStore("config", () => {
     brandLogo,
     config,
     preferKnowledgeBase,
-    isSetupComplete,
     skipEmailWorkflow,
     isFeedbackMandatory,
   };
diff --git a/helpdesk/setup/welcome_ticket.py b/helpdesk/setup/welcome_ticket.py
index 94a3133b8..b85985439 100644
--- a/helpdesk/setup/welcome_ticket.py
+++ b/helpdesk/setup/welcome_ticket.py
@@ -1,8 +1,8 @@
 import frappe
 from frappe.desk.form.assign_to import add as add_assign
 
-AUTHOR_EMAIl = "ritvik@frappe.io"
-AUTHOR_NAME = "Ritvik Sardana"
+AUTHOR_EMAIl = "john@example.com"
+AUTHOR_NAME = "John Doe"
 CONTENT = """
 <p>
 Hi 👋
@@ -13,8 +13,8 @@
 You can get started right away by setting up a support email. This will help you see what
 your support will look like with Helpdesk!
 <br><br>
-If you face any issues, please reach out to us via <a href="https://frappedesk.com/helpdesk">
-https://frappedesk.com/helpdesk</a>
+If you face any issues, please reach out to us via <a href="https://support.frappe.io/helpdesk">
+https://support.frappe.io/helpdesk</a>
 <br><br>
 Best,
 <br>
@@ -38,7 +38,6 @@ def create_ticket():
     d.contact = AUTHOR_NAME
     d.via_customer_portal = True
     d.insert()
-    d.create_communication_via_contact(d.description)
     add_assign(
         {
             "doctype": "HD Ticket",