diff --git a/apps/web/app/(app)/[emailAccountId]/onboarding/OnboardingContent.tsx b/apps/web/app/(app)/[emailAccountId]/onboarding/OnboardingContent.tsx
index 715cbfdb82..e864cfb5c1 100644
--- a/apps/web/app/(app)/[emailAccountId]/onboarding/OnboardingContent.tsx
+++ b/apps/web/app/(app)/[emailAccountId]/onboarding/OnboardingContent.tsx
@@ -27,7 +27,7 @@ interface OnboardingContentProps {
 }
 
 export function OnboardingContent({ step }: OnboardingContentProps) {
-  const { emailAccountId, provider } = useAccount();
+  const { emailAccountId, provider, isLoading } = useAccount();
 
   useSignUpEvent();
 
@@ -101,5 +101,10 @@ export function OnboardingContent({ step }: OnboardingContentProps) {
 
   const renderStep = steps[clampedStep - 1] || steps[0];
 
+  // Show loading if provider is needed but not loaded yet
+  if (isLoading && !provider) {
+    return null;
+  }
+
   return renderStep ? renderStep() : null;
 }
diff --git a/apps/web/utils/category-config.tsx b/apps/web/utils/category-config.tsx
index b531b0c996..2ef13cd6ef 100644
--- a/apps/web/utils/category-config.tsx
+++ b/apps/web/utils/category-config.tsx
@@ -37,7 +37,7 @@ export const categoryConfig = (
     tooltipText: "Newsletters, blogs, and publications",
     Icon: NewspaperIcon,
     iconColor: "purple",
-    action: "label",
+    action: isMicrosoftProvider(provider) ? "move_folder" : "label",
   },
   {
     key: SystemRule.Marketing,
@@ -61,7 +61,7 @@ export const categoryConfig = (
     tooltipText: "Invoices, receipts, and payments",
     Icon: ReceiptIcon,
     iconColor: "orange",
-    action: "label",
+    action: isMicrosoftProvider(provider) ? "move_folder" : "label",
   },
   {
     key: SystemRule.Notification,
@@ -69,7 +69,7 @@ export const categoryConfig = (
     tooltipText: "Alerts, status updates, and system messages",
     Icon: BellIcon,
     iconColor: "red",
-    action: "label",
+    action: isMicrosoftProvider(provider) ? "move_folder" : "label",
   },
   {
     key: SystemRule.ColdEmail,
diff --git a/version.txt b/version.txt
index f9564ca3d5..095157819d 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-v2.15.3
+v2.15.4