diff --git a/auto-analyst-frontend/app/api/trial/start/route.ts b/auto-analyst-frontend/app/api/trial/start/route.ts
index c6717fc0..ef2095ad 100644
--- a/auto-analyst-frontend/app/api/trial/start/route.ts
+++ b/auto-analyst-frontend/app/api/trial/start/route.ts
@@ -98,9 +98,15 @@ export async function POST(request: NextRequest) {
       trial_end: trialEndTimestamp,
       expand: ['latest_invoice.payment_intent'],
       payment_behavior: 'default_incomplete',
+      default_payment_method: setupIntent.payment_method as string,
       payment_settings: {
         save_default_payment_method: 'on_subscription',
       },
+      trial_settings: {
+        end_behavior: {
+          missing_payment_method: 'cancel'
+        }
+      },
       metadata: {
         userId: userId || 'anonymous',
         planName: metadata.planName || planName || 'Standard',
diff --git a/auto-analyst-frontend/lib/credits-config.ts b/auto-analyst-frontend/lib/credits-config.ts
index 5ed9d280..719659d0 100644
--- a/auto-analyst-frontend/lib/credits-config.ts
+++ b/auto-analyst-frontend/lib/credits-config.ts
@@ -49,9 +49,9 @@ export interface TrialConfig {
  * Trial period configuration - Change here to update across the entire app
  */
 export const TRIAL_CONFIG: TrialConfig = {
-  duration: 2,
+  duration: 15,
   unit: 'minutes',
-  displayText: '2-Minute Free Trial',
+  displayText: '15-Minute Free Trial',
   credits: 500
 }