diff --git a/spa/__init__.py b/spa/__init__.py
index e69de29..b31856c 100644
--- a/spa/__init__.py
+++ b/spa/__init__.py
@@ -0,0 +1 @@
+import signals
diff --git a/spa/models/UserProfile.py b/spa/models/UserProfile.py
index d14a3c5..4fa5188 100644
--- a/spa/models/UserProfile.py
+++ b/spa/models/UserProfile.py
@@ -143,10 +143,4 @@ class UserProfile(_BaseModel):
         return urlparse.urljoin(settings.STATIC_URL, "img/default-avatar-32.png")
 
 
-def create_user_profile(sender, instance, created, **kwargs):
-    if created:
-        UserProfile.objects.create(user=instance)
-
-
-post_save.connect(create_user_profile, sender=User)
 
diff --git a/spa/signals.py b/spa/signals.py
index 093880d..20ec063 100644
--- a/spa/signals.py
+++ b/spa/signals.py
@@ -4,9 +4,11 @@ from django.db.models.signals import post_save
 from django.dispatch import Signal
 from kombu import Connection
 from kombu.entity import Exchange
+from django.contrib.auth.models import User
 
 from dss import localsettings
 from spa.models import _Activity
+from spa.models import UserProfile
 from spa.models.Mix import Mix
 import pika
 
@@ -43,3 +45,11 @@ def send_activity_to_message_queue(sender, *args, **kwargs):
 
 
 post_save.connect(send_activity_to_message_queue, sender=None)
+
+
+def create_user_profile(sender, instance, created, **kwargs):
+    if created:
+        UserProfile.objects.create(user=instance)
+
+
+post_save.connect(create_user_profile, sender=User, dispatch_uid="users-profilecreation")