diff --git a/CHANGELOG b/CHANGELOG
index dc2eb7236..428b7fde7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@ CHANGELOG Roundcube Webmail
 ===========================
 
 - Managesieve: Fix so "Create filter" option does not show up when Filters menu is disabled (#6723)
+- Enigma: Fix bug where revoked users/keys were not greyed out in key info
 - Fix bug where bmp images couldn't be displayed on some systems (#6728)
 - Fix bug in parsing vCard data using PHP 7.3 due to an invalid regexp (#6744)
 
diff --git a/plugins/enigma/README b/plugins/enigma/README
index e2b3c824c..8bc173391 100644
--- a/plugins/enigma/README
+++ b/plugins/enigma/README
@@ -58,7 +58,7 @@ Make sure that vendor/bin/crypt-gpg-pinentry works from command line.
 Possible reasons:
 - non-working loader in shebang (#! /usr/bin/env php)
   Make sure it works for the user the php scripts are executed upon
-  (i.e. apache, www-date, etc.)
+  (i.e. apache, www-data, etc.)
 - SELinux setting, try command: setsebool -P httpd_unified 0
 
 Note: pinentry is used with gpg >= 2.0 and <= 2.1.12.
diff --git a/plugins/enigma/lib/enigma_ui.php b/plugins/enigma/lib/enigma_ui.php
index 2d5d376f1..2c93b7412 100644
--- a/plugins/enigma/lib/enigma_ui.php
+++ b/plugins/enigma/lib/enigma_ui.php
@@ -423,12 +423,12 @@ class enigma_ui
                 }
             }
 
+            $table->set_row_attribs($subkey->revoked || ($subkey->expires && $subkey->expires < $now) ? 'deleted' : '');
             $table->add('id', $subkey->get_short_id());
             $table->add('algo', $algo);
             $table->add('created', $subkey->created ? $this->rc->format_date($subkey->created, $date_format, false) : '');
             $table->add('expires', $subkey->expires ? $this->rc->format_date($subkey->expires, $date_format, false) : $this->enigma->gettext('expiresnever'));
             $table->add('usage', implode(',', $usage));
-            $table->set_row_attribs($subkey->revoked || ($subkey->expires && $subkey->expires < $now) ? 'deleted' : '');
         }
 
         $out .= html::tag('fieldset', null,
@@ -448,9 +448,9 @@ class enigma_ui
             }
             $username .= ' <' . $user->email . '>';
 
+            $table->set_row_attribs($user->revoked || !$user->valid ? 'deleted' : '');
             $table->add('id', rcube::Q(trim($username)));
             $table->add('valid', $this->enigma->gettext($user->valid ? 'valid' : 'unknown'));
-            $table->set_row_attribs($user->revoked || !$user->valid ? 'deleted' : '');
         }
 
         $out .= html::tag('fieldset', null,