diff --git a/plugins/enigma/lib/enigma_ui.php b/plugins/enigma/lib/enigma_ui.php
index 0bce43014..d7095c420 100644
--- a/plugins/enigma/lib/enigma_ui.php
+++ b/plugins/enigma/lib/enigma_ui.php
@@ -436,12 +436,9 @@ class enigma_ui
         $table->add_header('valid', $this->enigma->gettext('uservalid'));
 
         foreach ($this->data->users as $user) {
-            // Convert punny-code domain into UTF8
-            if (($pos = strpos($user->email, '@xn--')) > 0) {
-                $domain = substr($user->email, $pos + 1);
-                if ($domain = rcube_utils::idn_to_utf8($domain)) {
-                    $user->email = substr($user->email, 0, $pos + 1) . $domain;
-                }
+            // Display domains in UTF8
+            if ($email = rcube_utils::idn_to_utf8($user->email)) {
+                $user->email = $email;
             }
 
             $username = $user->name;