diff --git a/r2/r2/controllers/ipn.py b/r2/r2/controllers/ipn.py
index 77b48ef74..e50c4865a 100644
--- a/r2/r2/controllers/ipn.py
+++ b/r2/r2/controllers/ipn.py
@@ -196,8 +196,8 @@ def existing_subscription(subscr_id, paying_id, custom):
         account = Account._byID(account_id, data=True)
 
         if account._deleted:
-            g.log.info("Just got IPN renewal for deleted account #%d"
-                       % account_id)
+            g.log.info("IPN renewal for deleted account %d (%s)", account_id,
+                       subscr_id)
             return "deleted account"
 
         if should_set_subscriber:
diff --git a/r2/r2/models/admintools.py b/r2/r2/models/admintools.py
index 000e5b874..e0a1fdd40 100644
--- a/r2/r2/models/admintools.py
+++ b/r2/r2/models/admintools.py
@@ -237,7 +237,8 @@ def accountid_from_paypalsubscription(subscr_id):
         return None
 
     q = Account._query(Account.c.gold_subscr_id == subscr_id,
-                       Account.c._spam == (True, False), data=False)
+                       Account.c._spam == (True, False),
+                       Account.c._deleted == (True, False), data=False)
     l = list(q)
     if l:
         return l[0]._id