diff --git a/src/lib/components/feedback/feedback.svelte b/src/lib/components/feedback/feedback.svelte
index db063755a..0a3d17b7c 100644
--- a/src/lib/components/feedback/feedback.svelte
+++ b/src/lib/components/feedback/feedback.svelte
@@ -6,7 +6,10 @@
         feedbackOptions,
         feedbackData
     } from '$lib/stores/feedback';
+    import { user } from '$lib/stores/user';
+    import { organization } from '$lib/stores/organization';
     import { addNotification } from '$lib/stores/notifications';
+    import { page } from '$app/stores';
 
     $: $selectedFeedback = feedbackOptions.find((option) => option.type === $feedback.type);
 
@@ -15,8 +18,11 @@
             await feedback.submitFeedback(
                 `feedback-${$feedback.type}`,
                 $feedbackData.message,
-                $feedbackData.name,
-                $feedbackData.email
+                $user.name,
+                $user.email,
+                $organization.billingPlan,
+                $page.url.href,
+                $feedbackData.value
             );
             addNotification({
                 type: 'success',
diff --git a/src/routes/console/wizard/feedback/step1.svelte b/src/routes/console/wizard/feedback/step1.svelte
index c767a19db..17219cc26 100644
--- a/src/routes/console/wizard/feedback/step1.svelte
+++ b/src/routes/console/wizard/feedback/step1.svelte
@@ -6,7 +6,10 @@
         feedbackOptions,
         feedback
     } from '$lib/stores/feedback';
+    import { user } from '$lib/stores/user';
+    import { organization } from '$lib/stores/organization';
     import { addNotification } from '$lib/stores/notifications';
+    import { page } from '$app/stores';
 
     $: $selectedFeedback = feedbackOptions.find((option) => option.type === $feedback.type);
 
@@ -15,8 +18,11 @@
             await feedback.submitFeedback(
                 `feedback-${$feedback.type}`,
                 $feedbackData.message,
-                $feedbackData.name,
-                $feedbackData.email
+                $user.name,
+                $user.email,
+                $organization.billingPlan,
+                $page.url.href,
+                $feedbackData.value
             );
             addNotification({
                 type: 'success',