diff --git a/apps/user/models.py b/apps/user/models.py
index f53fb977..e3b0cc7b 100644
--- a/apps/user/models.py
+++ b/apps/user/models.py
@@ -137,7 +137,7 @@ def send_user_info_to_mixpanel(sender, instance=None, created=False, **kwargs):
 def auto_create_subscription(sender, instance=None, created=False, **kwargs):
     try:
         es = EmailSubscription.objects.get(email=instance.email)
-        if not es.user:
+        if not hasattr(instance, 'email_subscription'):
             es.user = instance
             es.save()
     except EmailSubscription.DoesNotExist: