diff --git a/projects/msp-tools/quote-wizard/frontend/src/components/wizard/steps/Step6Summary.tsx b/projects/msp-tools/quote-wizard/frontend/src/components/wizard/steps/Step6Summary.tsx
index 17369af..403d7ee 100644
--- a/projects/msp-tools/quote-wizard/frontend/src/components/wizard/steps/Step6Summary.tsx
+++ b/projects/msp-tools/quote-wizard/frontend/src/components/wizard/steps/Step6Summary.tsx
@@ -88,54 +88,58 @@ export function Step6Summary({
         </div>
       )}
 
-      {/* GPS Monitoring Section */}
-      <SummarySection
-        icon={<Monitor className="w-5 h-5" />}
-        title="GPS Monitoring"
-        monthlyTotal={result.gpsMonthly}
-        onEdit={() => onGoToStep(1)}
-      >
-        <div className="space-y-2">
-          <SummaryLine
-            label={`${gpsTier?.name} Plan (${quoteData.gps.endpointCount} endpoints)`}
-            value={formatCurrency(result.breakdown.gps.monitoring)}
-          />
-          {quoteData.gps.includeEquipment && quoteData.gps.equipmentDeviceCount > 0 && (
+      {/* GPS Monitoring Section - only show if enabled */}
+      {quoteData.serviceInterests.gps && (
+        <SummarySection
+          icon={<Monitor className="w-5 h-5" />}
+          title="GPS Monitoring"
+          monthlyTotal={result.gpsMonthly}
+          onEdit={() => onGoToStep(1)}
+        >
+          <div className="space-y-2">
             <SummaryLine
-              label={`Equipment Pack (${quoteData.gps.equipmentDeviceCount} devices)`}
-              value={formatCurrency(result.breakdown.gps.equipment)}
+              label={`${gpsTier?.name} Plan (${quoteData.gps.endpointCount} endpoints)`}
+              value={formatCurrency(result.breakdown.gps.monitoring)}
             />
-          )}
-        </div>
-      </SummarySection>
+            {quoteData.gps.includeEquipment && quoteData.gps.equipmentDeviceCount > 0 && (
+              <SummaryLine
+                label={`Equipment Pack (${quoteData.gps.equipmentDeviceCount} devices)`}
+                value={formatCurrency(result.breakdown.gps.equipment)}
+              />
+            )}
+          </div>
+        </SummarySection>
+      )}
 
-      {/* Support Plan Section */}
-      <SummarySection
-        icon={<Headphones className="w-5 h-5" />}
-        title="Support Plan"
-        monthlyTotal={result.supportMonthly}
-        onEdit={() => onGoToStep(2)}
-      >
-        <div className="space-y-2">
-          {quoteData.support.planId === 'none' ? (
-            <SummaryLine
-              label="No Monthly Plan (pay-as-you-go)"
-              value="$0"
-            />
-          ) : (
-            <SummaryLine
-              label={`${supportPlan?.name} Plan (${supportPlan?.includedHours} hrs/mo)`}
-              value={formatCurrency(result.breakdown.support.plan)}
-            />
-          )}
-          {blockTime && (
-            <SummaryLine
-              label={`Block Time (${blockTime.hours} hours) — one-time`}
-              value={formatCurrency(result.breakdown.support.blockTime)}
-            />
-          )}
-        </div>
-      </SummarySection>
+      {/* Support Plan Section - only show if enabled */}
+      {quoteData.serviceInterests.support && (
+        <SummarySection
+          icon={<Headphones className="w-5 h-5" />}
+          title="Support Plan"
+          monthlyTotal={result.supportMonthly}
+          onEdit={() => onGoToStep(2)}
+        >
+          <div className="space-y-2">
+            {quoteData.support.planId === 'none' ? (
+              <SummaryLine
+                label="No Monthly Plan (pay-as-you-go)"
+                value="$0"
+              />
+            ) : (
+              <SummaryLine
+                label={`${supportPlan?.name} Plan (${supportPlan?.includedHours} hrs/mo)`}
+                value={formatCurrency(result.breakdown.support.plan)}
+              />
+            )}
+            {blockTime && (
+              <SummaryLine
+                label={`Block Time (${blockTime.hours} hours) — one-time`}
+                value={formatCurrency(result.breakdown.support.blockTime)}
+              />
+            )}
+          </div>
+        </SummarySection>
+      )}
 
       {/* VoIP Section */}
       {quoteData.voip.enabled && (
@@ -230,15 +234,19 @@ export function Step6Summary({
           Monthly Breakdown
         </h4>
         <div className="space-y-3">
-          <BreakdownRow label="GPS Monitoring" value={result.gpsMonthly} />
-          <BreakdownRow label="Support Plan" value={result.supportMonthly} />
-          {quoteData.voip.enabled && (
+          {quoteData.serviceInterests.gps && (
+            <BreakdownRow label="GPS Monitoring" value={result.gpsMonthly} />
+          )}
+          {quoteData.serviceInterests.support && (
+            <BreakdownRow label="Support Plan" value={result.supportMonthly} />
+          )}
+          {quoteData.serviceInterests.voip && quoteData.voip.enabled && (
             <BreakdownRow label="VoIP Phone System" value={result.voipMonthly} />
           )}
-          {quoteData.webHosting.enabled && (
+          {quoteData.serviceInterests.webHosting && quoteData.webHosting.enabled && (
             <BreakdownRow label="Web Hosting" value={result.webHostingMonthly} />
           )}
-          {quoteData.email.enabled && (
+          {quoteData.serviceInterests.email && quoteData.email.enabled && (
             <BreakdownRow label="Email Service" value={result.emailMonthly} />
           )}
           <div className="pt-4 mt-1 border-t-2 border-[#fe7400]/20 flex justify-between items-center">
diff --git a/projects/msp-tools/quote-wizard/frontend/src/hooks/useQuote.ts b/projects/msp-tools/quote-wizard/frontend/src/hooks/useQuote.ts
index 4df2364..c2de951 100644
--- a/projects/msp-tools/quote-wizard/frontend/src/hooks/useQuote.ts
+++ b/projects/msp-tools/quote-wizard/frontend/src/hooks/useQuote.ts
@@ -568,32 +568,40 @@ export function useQuote(): UseQuoteReturn {
   }, [email]);
 
   const calculateQuote = useCallback((): QuoteResult => {
-    const gpsMonthly = getGPSMonthly();
-    const supportMonthly = getSupportMonthly();
-    const voipMonthly = getVoIPMonthly();
-    const voipOneTime = getVoIPOneTime();
-    const supportBlockTimeOneTime = getSupportBlockTimeOneTime();
-    const webHostingMonthly = getWebHostingMonthly();
-    const emailMonthly = getEmailMonthly();
+    // Only include services that are enabled in serviceInterests
+    const gpsMonthly = serviceInterests.gps ? getGPSMonthly() : 0;
+    const supportMonthly = serviceInterests.support ? getSupportMonthly() : 0;
+    const supportBlockTimeOneTime = serviceInterests.support ? getSupportBlockTimeOneTime() : 0;
+    const voipMonthly = serviceInterests.voip ? getVoIPMonthly() : 0;
+    const voipOneTime = serviceInterests.voip ? getVoIPOneTime() : 0;
+    const webHostingMonthly = serviceInterests.webHosting ? getWebHostingMonthly() : 0;
+    const emailMonthly = serviceInterests.email ? getEmailMonthly() : 0;
 
-    // Calculate GPS breakdown
-    const gpsTier = gpsTiers.find((t) => t.id === gps.tierId);
-    const gpsMonitoring = gpsTier ? gpsTier.pricePerEndpoint * gps.endpointCount : 0;
+    // Calculate GPS breakdown (only if enabled)
+    let gpsMonitoring = 0;
     let gpsEquipment = 0;
-    if (gps.includeEquipment && gps.equipmentDeviceCount > 0) {
-      const additionalDevices = Math.max(0, gps.equipmentDeviceCount - equipmentMonitoring.baseDevices);
-      gpsEquipment = equipmentMonitoring.basePrice + (additionalDevices * equipmentMonitoring.additionalDevicePrice);
+    if (serviceInterests.gps) {
+      const gpsTier = gpsTiers.find((t) => t.id === gps.tierId);
+      gpsMonitoring = gpsTier ? gpsTier.pricePerEndpoint * gps.endpointCount : 0;
+      if (gps.includeEquipment && gps.equipmentDeviceCount > 0) {
+        const additionalDevices = Math.max(0, gps.equipmentDeviceCount - equipmentMonitoring.baseDevices);
+        gpsEquipment = equipmentMonitoring.basePrice + (additionalDevices * equipmentMonitoring.additionalDevicePrice);
+      }
     }
 
-    // Calculate support breakdown
-    const supportPlan = support.planId !== 'none' ? supportPlans.find((p) => p.id === support.planId) : null;
-    const supportPlanCost = supportPlan ? supportPlan.monthlyPrice : 0;
+    // Calculate support breakdown (only if enabled)
+    let supportPlanCost = 0;
+    if (serviceInterests.support && support.planId !== 'none') {
+      const supportPlan = supportPlans.find((p) => p.id === support.planId);
+      supportPlanCost = supportPlan ? supportPlan.monthlyPrice : 0;
+    }
 
-    // Calculate VoIP breakdown
-    const voipTier = voipTiers.find((t) => t.id === voip.tierId);
-    const voipService = voip.enabled && voipTier ? voipTier.pricePerUser * voip.userCount : 0;
+    // Calculate VoIP breakdown (only if enabled)
+    let voipService = 0;
     let voipHardwareMonthly = 0;
-    if (voip.enabled) {
+    if (serviceInterests.voip && voip.enabled) {
+      const voipTier = voipTiers.find((t) => t.id === voip.tierId);
+      voipService = voipTier ? voipTier.pricePerUser * voip.userCount : 0;
       voip.hardware.forEach((hw) => {
         if (hw.isRental) {
           const hardware = voipHardware.find((h) => h.id === hw.hardwareId);
@@ -639,7 +647,7 @@ export function useQuote(): UseQuoteReturn {
 
     setQuoteResult(result);
     return result;
-  }, [gps, support, voip, webHosting, email, getGPSMonthly, getSupportMonthly, getSupportBlockTimeOneTime, getVoIPMonthly, getVoIPOneTime, getWebHostingMonthly, getEmailMonthly]);
+  }, [serviceInterests, gps, support, voip, webHosting, email, getGPSMonthly, getSupportMonthly, getSupportBlockTimeOneTime, getVoIPMonthly, getVoIPOneTime, getWebHostingMonthly, getEmailMonthly]);
 
   // ============================================================================
   // Reset
diff --git a/projects/msp-tools/quote-wizard/php-api/api/config.php b/projects/msp-tools/quote-wizard/php-api/api/config.php
index c33e7ca..9bce0c1 100644
--- a/projects/msp-tools/quote-wizard/php-api/api/config.php
+++ b/projects/msp-tools/quote-wizard/php-api/api/config.php
@@ -29,6 +29,9 @@ define('GRAPH_TENANT_ID', 'ce61461e-81a0-4c84-bb4a-7b354a9a356d');
 define('GRAPH_CLIENT_ID', '15b0fafb-ab51-4cc9-adc7-f6334c805c22');
 define('GRAPH_CLIENT_SECRET', 'rRN8Q~FPfSL8O24iZthi_LVJTjGOCZG.DnxGHaSk');
 define('GRAPH_SENDER_EMAIL', 'noreply@azcomputerguru.com');
+define('GRAPH_SENDER_NAME', 'Arizona Computer Guru');
+define('GRAPH_REPLY_TO_EMAIL', 'admin@azcomputerguru.com');
+define('GRAPH_REPLY_TO_NAME', 'Arizona Computer Guru');
 
 // --------------------------------------------------------------------------
 // Admin / Auth
diff --git a/projects/msp-tools/quote-wizard/php-api/api/services/email_service.php b/projects/msp-tools/quote-wizard/php-api/api/services/email_service.php
index 6455006..9ca27a3 100644
--- a/projects/msp-tools/quote-wizard/php-api/api/services/email_service.php
+++ b/projects/msp-tools/quote-wizard/php-api/api/services/email_service.php
@@ -124,9 +124,23 @@ function send_email(string $to_email, string $subject, string $body_html, ?strin
                 'contentType' => 'HTML',
                 'content'     => $body_html,
             ],
+            'from' => [
+                'emailAddress' => [
+                    'name'    => defined('GRAPH_SENDER_NAME') ? GRAPH_SENDER_NAME : 'Arizona Computer Guru',
+                    'address' => GRAPH_SENDER_EMAIL,
+                ],
+            ],
             'toRecipients' => [
                 ['emailAddress' => ['address' => $to_email]],
             ],
+            'replyTo' => [
+                [
+                    'emailAddress' => [
+                        'name'    => defined('GRAPH_REPLY_TO_NAME') ? GRAPH_REPLY_TO_NAME : 'Arizona Computer Guru',
+                        'address' => defined('GRAPH_REPLY_TO_EMAIL') ? GRAPH_REPLY_TO_EMAIL : GRAPH_SENDER_EMAIL,
+                    ],
+                ],
+            ],
         ],
         'saveToSentItems' => 'true',
     ];