diff --git a/src/warden-server/lib/Warden.pm b/src/warden-server/lib/Warden.pm
index ce154d8b7e8142c61ef0d46908b522b54faa68a1..398e21c04cb365714db3577e6be418819f27d5af 100755
--- a/src/warden-server/lib/Warden.pm
+++ b/src/warden-server/lib/Warden.pm
@@ -431,19 +431,19 @@ sub registerSender
     my $ip_net_client		= $data->{'IP_NET_CLIENT'};
 
     # check if sender has been already registered
-    $sth = $DBH->prepare("SELECT registered FROM clients WHERE hostname = ? AND requestor = ? AND service = ? AND client_type = ? AND type = ? AND receive_own_events = ? AND description_tags = ? AND ip_net_client = ? LIMIT 1;");
+    $sth = $DBH->prepare("SELECT registered FROM clients WHERE hostname = ? AND requestor = ? AND service = ? AND client_type = ? AND description_tags = ? AND ip_net_client = ? LIMIT 1;");
     if (!defined $sth) {
       sendMsg("err",
              "Cannot prepare statement in function '$function_name': $DBH->errstr",
              "Internal 'prepare' server error");
     }
-    $sth->execute($hostname, $requestor, $service, $client_type, $type, $receive_own_events, $description_tags, $ip_net_client);
+    $sth->execute($hostname, $requestor, $service, $client_type, $description_tags, $ip_net_client);
     my $result = $sth->fetchrow();
 
     # register new sender
     if (defined $result) {
       sendMsg("err",
-             "Attempt to re-register the sender '$hostname', '$requestor', '$service', '$client_type', '$type', '$receive_own_events', '$description_tags', '$ip_net_client'",
+             "Attempt to re-register the sender: {'$hostname', '$requestor', '$service', '$client_type', '$description_tags', '$ip_net_client'}",
              "Sender has been already registered at '$result'");
     } else {
       $sth = $DBH->prepare("INSERT INTO clients VALUES (?,?,?,?,?,?,?,?,?,?);");
@@ -454,7 +454,7 @@ sub registerSender
       }
       $sth->execute(undef, $hostname, $registered, $requestor, $service, $client_type, $type, $receive_own_events, $description_tags, $ip_net_client);
         sendMsg("info",
-	       "New sender '$hostname' (service: '$service', cidr: '$ip_net_client') was registered",
+	       "New sender '$hostname' {'$requestor', '$service', '$description_tags', '$ip_net_client'} was registered",
 	        undef);
       return 1;
     }
@@ -496,19 +496,19 @@ sub registerReceiver
     my $ip_net_client		= $data->{'IP_NET_CLIENT'};
 
     # check if receiver has been already registered
-    $sth = $DBH->prepare("SELECT registered FROM clients WHERE hostname = ? AND requestor = ? AND service = ? AND client_type = ? AND type = ? AND receive_own_events = ? AND description_tags = ? AND ip_net_client = ? LIMIT 1;");
+    $sth = $DBH->prepare("SELECT registered FROM clients WHERE hostname = ? AND requestor = ? AND client_type = ? AND type = ? AND receive_own_events = ? AND ip_net_client = ? LIMIT 1;");
     if (!defined $sth) {
       sendMsg("err",
              "Cannot prepare statement in function '$function_name': $DBH->errstr",
 	     "Internal 'prepare' server error");
     }
-    $sth->execute($hostname, $requestor, $service, $client_type, $type, $receive_own_events, $description_tags, $ip_net_client);
+    $sth->execute($hostname, $requestor, $client_type, $type, $receive_own_events, $ip_net_client);
     my $result = $sth->fetchrow();
 
     # register new receiver
     if (defined $result) {
       sendMsg("err",
-             "Attempt to re-register the receiver '$hostname', '$requestor', '$service', '$client_type', '$type', '$receive_own_events', '$description_tags', '$ip_net_client'",
+             "Attempt to re-register the receiver: {'$hostname', '$requestor', '$client_type', '$type', '$receive_own_events', '$ip_net_client'}",
              "Receiver has already been registered at '$result'");
     } else {
       $sth = $DBH->prepare("INSERT INTO clients VALUES (?,?,?,?,?,?,?,?,?,?);");
@@ -519,7 +519,7 @@ sub registerReceiver
       }
       $sth->execute(undef, $hostname, $registered, $requestor, $service, $client_type, $type, $receive_own_events, $description_tags, $ip_net_client);
       sendMsg("info",
-             "New receiver '$hostname' (type: '$type', cidr: '$ip_net_client', receive_own_events: '$receive_own_events') was registered",
+             "New receiver '$hostname' {'$requestor', '$type', '$ip_net_client', '$receive_own_events'} was registered",
 	      undef);
       return 1;
     }