diff --git a/plugins/password/config.inc.php.dist b/plugins/password/config.inc.php.dist
index ffcbf6639..1c2266727 100644
--- a/plugins/password/config.inc.php.dist
+++ b/plugins/password/config.inc.php.dist
@@ -401,16 +401,7 @@ $config['hmailserver_server'] = array(
 
 // Virtualmin Driver options
 // -------------------------
-// Username format:
-// 0: username@domain
-// 1: username%domain
-// 2: username.domain
-// 3: domain.username
-// 4: username-domain
-// 5: domain-username
-// 6: username_domain
-// 7: domain_username
-$config['password_virtualmin_format'] = 0;
+// No settings needed
 
 
 // pw_usermod Driver options
diff --git a/plugins/password/drivers/virtualmin.php b/plugins/password/drivers/virtualmin.php
index f219eacc6..ea81f56fe 100644
--- a/plugins/password/drivers/virtualmin.php
+++ b/plugins/password/drivers/virtualmin.php
@@ -34,46 +34,28 @@ class rcube_virtualmin_password
     function save($currpass, $newpass)
     {
         $rcmail   = rcmail::get_instance();
-        $format   = $rcmail->config->get('password_virtualmin_format', 0);
         $username = $_SESSION['username'];
+        $curdir   = RCUBE_PLUGINS_DIR . 'password/helpers';
+        $username = escapeshellarg($username);
 
-        switch ($format) {
-        case 1: // username%domain
-            $domain = substr(strrchr($username, "%"), 1);
-            break;
-        case 2: // username.domain (could be bogus)
-            $pieces = explode(".", $username);
-            $domain = $pieces[count($pieces)-2]. "." . end($pieces);
-            break;
-        case 3: // domain.username (could be bogus)
-            $pieces = explode(".", $username);
-            $domain = $pieces[0]. "." . $pieces[1];
-            break;
-        case 4: // username-domain
-            $domain = substr(strrchr($username, "-"), 1);
-            break;
-        case 5: // domain-username
-            $domain = str_replace(strrchr($username, "-"), "", $username);
-            break;
-        case 6: // username_domain
-            $domain = substr(strrchr($username, "_"), 1);
-            break;
-        case 7: // domain_username
-            $pieces = explode("_", $username);
-            $domain = $pieces[0];
-            break;
-        default: // username@domain
-            $domain = substr(strrchr($username, "@"), 1);
-        }
+        // Get the domain using virtualmin CLI:
+        exec("$curdir/chgvirtualminpasswd list-domains --mail-user $username --name-only", $output_domain, $returnvalue);
 
-        if (!$domain) {
-            $domain = $rcmail->user->get_username('domain');
+        if ($returnvalue == 0 && count($output_domain) == 1)
+        {
+            $domain = trim($output_domain[0]);
+        }
+        else {
+            rcube::raise_error(array(
+                'code' => 600,
+                'type' => 'php',
+                'file' => __FILE__, 'line' => __LINE__,
+                'message' => "Password plugin: Unable to execute $curdir/chgvirtualminpasswd or domain for mail-user '$username' not known to Virtualmin"
+                ), true, false);
         }
 
-        $username = escapeshellarg($username);
         $domain   = escapeshellarg($domain);
         $newpass  = escapeshellarg($newpass);
-        $curdir   = RCUBE_PLUGINS_DIR . 'password/helpers';
 
         exec("$curdir/chgvirtualminpasswd modify-user --domain $domain --user $username --pass $newpass", $output, $returnvalue);