diff --git a/mayan/apps/autoadmin/apps.py b/mayan/apps/autoadmin/apps.py
index 18596da92a..f6a0859724 100644
--- a/mayan/apps/autoadmin/apps.py
+++ b/mayan/apps/autoadmin/apps.py
@@ -18,7 +18,7 @@ class AutoAdminAppConfig(MayanAppConfig):
         super(AutoAdminAppConfig, self).ready()
 
         post_save.connect(
-            dispatch_uid='auto_admin_handler_account_password_change',
+            dispatch_uid='autoadmin_handler_account_password_change',
             receiver=handler_auto_admin_account_password_change,
             sender=settings.AUTH_USER_MODEL
         )
diff --git a/mayan/apps/documents/apps.py b/mayan/apps/documents/apps.py
index 39de85b960..cb358a0c90 100644
--- a/mayan/apps/documents/apps.py
+++ b/mayan/apps/documents/apps.py
@@ -566,12 +566,12 @@ class DocumentsApp(MayanAppConfig):
         )
 
         post_delete.connect(
-            dispatch_uid='handler_remove_empty_duplicates_lists',
+            dispatch_uid='documents_handler_remove_empty_duplicates_lists',
             receiver=handler_remove_empty_duplicates_lists,
             sender=Document
         )
         post_initial_setup.connect(
-            dispatch_uid='handler_create_default_document_type',
+            dispatch_uid='documents_handler_create_default_document_type',
             receiver=handler_create_default_document_type
         )
         post_migrate.connect(
@@ -579,7 +579,7 @@ class DocumentsApp(MayanAppConfig):
             receiver=handler_create_document_cache,
         )
         post_version_upload.connect(
-            dispatch_uid='handler_scan_duplicates_for',
+            dispatch_uid='documents_handler_scan_duplicates_for',
             receiver=handler_scan_duplicates_for
         )