diff --git a/CHANGELOG b/CHANGELOG
index ec9a0c662..0b296465b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Password: Automatic virtualmin domain setting, removed password_virtualmin_format option (#5759)
 - Support AUTHENTICATE LOGIN for IMAP connections (#5563)
 - Support LDAP GSSAPI authentication (#5703)
 - Allow contacts without an email address (#5079)
diff --git a/plugins/password/README b/plugins/password/README
index 8f3305a03..faef755ac 100644
--- a/plugins/password/README
+++ b/plugins/password/README
@@ -236,7 +236,7 @@
 
  As in sasl driver this one allows to change password using shell
  utility called "virtualmin". See helpers/chgvirtualminpasswd.c for
- installation instructions. See also config.inc.php.dist file.
+ installation instructions. Requires virtualmin >= 4.09.
 
 
  2.9. hMailServer (hmail)
diff --git a/plugins/password/config.inc.php.dist b/plugins/password/config.inc.php.dist
index ffcbf6639..76dc47104 100644
--- a/plugins/password/config.inc.php.dist
+++ b/plugins/password/config.inc.php.dist
@@ -399,20 +399,6 @@ $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;
-
-
 // pw_usermod Driver options
 // --------------------------
 // Use comma delimited exlist to disable password change for users.
diff --git a/plugins/password/drivers/virtualmin.php b/plugins/password/drivers/virtualmin.php
index f219eacc6..28f9d8201 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);
+
+        // Get the domain using virtualmin CLI:
+        exec("$curdir/chgvirtualminpasswd list-domains --mail-user $username --name-only", $output_domain, $returnvalue);
 
-        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);
+        if ($returnvalue == 0 && count($output_domain) == 1) {
+            $domain = trim($output_domain[0]);
         }
+        else {
+            rcube::raise_error(array(
+                'code' => 600,
+                'file' => __FILE__, 'line' => __LINE__,
+                'message' => "Password plugin: Unable to execute $curdir/chgvirtualminpasswd or domain for mail-user '$username' not known to Virtualmin"
+                ), true, false);
 
-        if (!$domain) {
-            $domain = $rcmail->user->get_username('domain');
+            return PASSWORD_ERROR;
         }
 
-        $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);
 
@@ -83,7 +65,6 @@ class rcube_virtualmin_password
         else {
             rcube::raise_error(array(
                 'code' => 600,
-                'type' => 'php',
                 'file' => __FILE__, 'line' => __LINE__,
                 'message' => "Password plugin: Unable to execute $curdir/chgvirtualminpasswd"
                 ), true, false);