diff --git a/Kernel/System/CustomerUser.pm b/Kernel/System/CustomerUser.pm
index 8aa445767d..31236c434c 100644
--- a/Kernel/System/CustomerUser.pm
+++ b/Kernel/System/CustomerUser.pm
@@ -188,6 +188,19 @@ sub CustomerSearch {
     my $DynamicFieldBackendObject = $Kernel::OM->Get('Kernel::System::DynamicField::Backend');
 
     my %Data;
+
+    # Return empty set if no search parameter is defined.
+    if (
+        !$Param{Search}
+        && !$Param{UserLogin}
+        && !$Param{PostMasterSearch}
+        && !$Param{CustomerID}
+        && !$Param{CustomerIDRaw}
+        )
+    {
+        return %Data;
+    }
+
     SOURCE:
     for my $Count ( '', 1 .. 10 ) {
 
diff --git a/Kernel/System/CustomerUser/LDAP.pm b/Kernel/System/CustomerUser/LDAP.pm
index 7ce41676c7..ad7c47c63b 100644
--- a/Kernel/System/CustomerUser/LDAP.pm
+++ b/Kernel/System/CustomerUser/LDAP.pm
@@ -377,7 +377,7 @@ sub CustomerSearch {
     {
         $Kernel::OM->Get('Kernel::System::Log')->Log(
             Priority => 'error',
-            Message  => 'Need Search, UserLogin, PostMasterSearch or CustomerID!'
+            Message  => 'Need Search, UserLogin, PostMasterSearch, CustomerIDRaw or CustomerID!'
         );
         return;
     }