diff --git a/services/platform-service/src/modules/delivery/subscribers.ts b/services/platform-service/src/modules/delivery/subscribers.ts
index c9fa3939..f260ce47 100644
--- a/services/platform-service/src/modules/delivery/subscribers.ts
+++ b/services/platform-service/src/modules/delivery/subscribers.ts
@@ -28,7 +28,7 @@ export function registerDeliverySubscribers(
           templateId: 'welcome',
           variables: {
             displayName: event.payload.email.split('@')[0],
-            productName: event.payload.productId,
+            productName: resolveProductName(event.payload.productId),
             dashboardUrl: resolveDashboardUrl(event.payload.productId),
           },
           productId: event.payload.productId,
@@ -168,7 +168,7 @@ export function registerDeliverySubscribers(
           variables: {
             displayName: user.displayName,
             productName: resolveProductName(productId),
-            daysLeft: String(daysLeft),
+            daysLeft,
             upgradeUrl: `${baseUrl}/billing`,
           },
           productId,
diff --git a/services/platform-service/src/modules/surveys/routes.ts b/services/platform-service/src/modules/surveys/routes.ts
index d4af8232..29bafbc3 100644
--- a/services/platform-service/src/modules/surveys/routes.ts
+++ b/services/platform-service/src/modules/surveys/routes.ts
@@ -555,16 +555,16 @@ async function publicRoutes(app: FastifyInstance): Promise<void> {
             tokensIncluded: sub.tokensIncluded + survey.incentive.amount,
           });
         }
-      }
-      incentiveClaimed = true;
-      await repo.updateResponse(id, userId, {
-        incentiveClaimed: true,
-        incentiveClaimedAt: now,
-      });
+        incentiveClaimed = true;
+        await repo.updateResponse(id, userId, {
+          incentiveClaimed: true,
+          incentiveClaimedAt: now,
+        });
 
-      await repo.updateSurveyMetrics(id, productId, {
-        incentiveClaims: survey.metrics.incentiveClaims + 1,
-      });
+        await repo.updateSurveyMetrics(id, productId, {
+          incentiveClaims: survey.metrics.incentiveClaims + 1,
+        });
+      }
     }
 
     return {