diff --git a/apps/user/models.py b/apps/user/models.py
index 988ec5ee..8d29759f 100644
--- a/apps/user/models.py
+++ b/apps/user/models.py
@@ -112,6 +112,9 @@ 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:
+            es.user = instance
+            es.save()
     except EmailSubscription.DoesNotExist:
         instance.email_subscription = EmailSubscription.objects.create(
             user=instance,