diff --git a/rugwebsite/views.py b/rugwebsite/views.py
index 99e3a06..09bf5a4 100644
--- a/rugwebsite/views.py
+++ b/rugwebsite/views.py
@@ -28,8 +28,10 @@ def gdpr_ask_agreement(request):
         raise PermissionError()
 
     for user in User.objects.filter(
-            # username__in=('p207263', 'p233780', 'p253591', 'p269380'),
             is_active=True).all():
+        if PendingGDPRAgree(user=user).exists() or GDPRAgreed(user=user).exists() or user.email is None \
+                or user.email == '':
+            continue
         token = get_random_string(length=32)
         pending = PendingGDPRAgree(user=user, token=token)
         pending.save()