diff --git a/colab/accounts/models.py b/colab/accounts/models.py
index 49322f3..a6ca51f 100644
--- a/colab/accounts/models.py
+++ b/colab/accounts/models.py
@@ -14,9 +14,10 @@ from .utils import mailman
 
 class ColabUserManager(UserManager):
 
-    def _create_user(self, *args, **kwargs):
+    def _create_user(self, username, email, password,
+                     is_staff, is_superuser, **kwargs):
+        args = (username, email, password, is_staff, is_superuser)
         user = super(ColabUserManager, self)._create_user(*args, **kwargs)
-        password = kwargs.get('password')
 
         user_created.send(user.__class__, user=user, password=password)
         return user
diff --git a/colab/accounts/tests/test_user.py b/colab/accounts/tests/test_user.py
index a57b9e3..558c64f 100644
--- a/colab/accounts/tests/test_user.py
+++ b/colab/accounts/tests/test_user.py
@@ -426,3 +426,22 @@ class UserTest(TestCase):
         self.authenticate_user()
         response = self.client.get(url, follow=True)
         self.assertIn(message, response.content)
+
+    @mock.patch('colab.accounts.signals.user_password_changed.send')
+    @mock.patch('colab.accounts.signals.user_created.send')
+    def test_user_created_signal(self, user_created_send,
+                                 user_password_changed_send):
+        user = User.objects.create_user(
+            username='test_user',
+            password='12345',
+            email='test@example.com',
+        )
+        user_created_send.assert_called_with(User, user=user, password='12345')
+        user_password_changed_send.assert_not_called()
+
+    @mock.patch('colab.accounts.signals.user_password_changed.send')
+    def test_user_password_changed_signal(self, user_password_changed_send):
+        user = User.objects.first()
+        user.set_password('54321')
+        user_password_changed_send.assert_called_with(User, user=user,
+                                                      password='54321')
--
libgit2 0.21.2