diff --git a/src/FloodUnblockManager.php b/src/FloodUnblockManager.php
index 97dd402..ae2d2e1 100755
--- a/src/FloodUnblockManager.php
+++ b/src/FloodUnblockManager.php
@@ -61,7 +61,7 @@ class FloodUnblockManager {
       $query->addField('f', 'identifier');
       $query->addField('f', 'identifier', 'ip');
       $query->addExpression('count(*)', 'count');
-      $query->condition('f.event', 'user.failed_login_ip');
+      $query->condition('f.event', '%failed_login_ip', 'LIKE');
       $query->groupBy('identifier');
       $results = $query->execute();
 
@@ -102,7 +102,7 @@ class FloodUnblockManager {
       $query = $this->database->select('flood', 'f');
       $query->addField('f', 'identifier');
       $query->addExpression('count(*)', 'count');
-      $query->condition('f.event', 'user.failed_login_user');
+      $query->condition('f.event', '%failed_login_user', 'LIKE');
       $query->groupBy('identifier');
       $results = $query->execute();
 
@@ -145,7 +145,7 @@ class FloodUnblockManager {
     $txn = $this->database->startTransaction('flood_unblock_clear');
     try {
       $query = $this->database->delete('flood')
-                              ->condition('event', $type);
+        ->condition('event', '%' . $type, 'LIKE');
       if (isset($identifier)) {
         $query->condition('identifier', $identifier);
       }
diff --git a/src/Form/FloodUnblockAdminForm.php b/src/Form/FloodUnblockAdminForm.php
index b83f884..3e306e1 100755
--- a/src/Form/FloodUnblockAdminForm.php
+++ b/src/Form/FloodUnblockAdminForm.php
@@ -150,11 +150,11 @@ class FloodUnblockAdminForm extends FormBase {
         $type = $form['table']['#options'][$value]['type'];
         switch ($type) {
           case 'ip':
-            $type = 'user.failed_login_ip';
+            $type = '.failed_login_ip';
             break;
 
           case 'user':
-            $type = 'user.failed_login_user';
+            $type = '.failed_login_user';
             break;
 
         }