diff --git a/vibes_auth/managers.py b/vibes_auth/managers.py
index a070ab40..fd5b4dea 100644
--- a/vibes_auth/managers.py
+++ b/vibes_auth/managers.py
@@ -22,11 +22,12 @@ class UserManager(BaseUserManager):
                     order.user = user
                     order.save()
                     orders.add(order.uuid)
-            for order in Order.objects.filter(attributes__icontains=user.phone_number):
-                if not order.user:
-                    order.user = user
-                    order.save()
-                    orders.add(order.uuid)
+            if user.phone_number:
+                for order in Order.objects.filter(attributes__icontains=user.phone_number):
+                    if not order.user:
+                        order.user = user
+                        order.save()
+                        orders.add(order.uuid)
             for address in Address.objects.filter(billing_address_order__in=orders):
                 if not address.user:
                     address.user = user