diff --git a/website/server/controllers/top-level/payments/amazon.js b/website/server/controllers/top-level/payments/amazon.js
index 5da9ae1330..0b005835b6 100644
--- a/website/server/controllers/top-level/payments/amazon.js
+++ b/website/server/controllers/top-level/payments/amazon.js
@@ -151,11 +151,6 @@ api.checkout = {
 
     await payments[method](data);
 
-    if (gift && gift.type === 'subscription' && gift.member._id !== user._id) {
-      gift.member = user;
-      await payments.createSubscription(data);
-    }
-
     res.respond(200);
   },
 };
diff --git a/website/server/controllers/top-level/payments/paypal.js b/website/server/controllers/top-level/payments/paypal.js
index 908ac1791e..8b695555d1 100644
--- a/website/server/controllers/top-level/payments/paypal.js
+++ b/website/server/controllers/top-level/payments/paypal.js
@@ -145,10 +145,6 @@ api.checkoutSuccess = {
 
     await paypalPaymentExecute(paymentId, { payer_id: customerId });
     await payments[method](data);
-    if (gift && gift.type === 'subscription' && gift.member._id !== data.user._id) {
-      gift.member = data.user;
-      await payments.createSubscription(data);
-    }
     res.redirect('/');
   },
 };
diff --git a/website/server/controllers/top-level/payments/stripe.js b/website/server/controllers/top-level/payments/stripe.js
index 50af49ca11..33b654672b 100644
--- a/website/server/controllers/top-level/payments/stripe.js
+++ b/website/server/controllers/top-level/payments/stripe.js
@@ -121,11 +121,6 @@ api.checkout = {
       }
 
       await payments[method](data);
-
-      if (gift && gift.type === 'subscription' && gift.member._id !== user._id) {
-        gift.member = user;
-        await payments.createSubscription(data);
-      }
     }
 
     res.respond(200, {});
diff --git a/website/server/libs/slack.js b/website/server/libs/slack.js
index eb87d8e02e..f195c02199 100644
--- a/website/server/libs/slack.js
+++ b/website/server/libs/slack.js
@@ -75,12 +75,10 @@ function sendSubscriptionNotification ({
   }
   let text;
   let timestamp = new Date();
-  if (!recipient.id) {
-    text = `${buyer.name} ${buyer.id} ${buyer.email} bought a ${months}-month recurring subscription using ${paymentMethod} on ${timestamp}`;
-  } else if (recipient.id === buyer.id) {
+  if (recipient.id) {
     text = `${buyer.name} ${buyer.id} ${buyer.email} bought a ${months}-month gift subscription for ${recipient.name} ${recipient.id} ${recipient.email} using ${paymentMethod} on ${timestamp}`;
   } else {
-    text = `${buyer.name} ${buyer.id} ${buyer.email} bought a ${months}-month gift subscription for ${recipient.name} ${recipient.id} ${recipient.email} and got a promo using ${paymentMethod} on ${timestamp}`;
+    text = `${buyer.name} ${buyer.id} ${buyer.email} bought a ${months}-month recurring subscription using ${paymentMethod} on ${timestamp}`;
   }
 
   subscriptionSlack.send({