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 1c2266727..76dc47104 100644
--- a/plugins/password/config.inc.php.dist
+++ b/plugins/password/config.inc.php.dist
@@ -399,11 +399,6 @@ $config['hmailserver_server'] = array(
 );
 
 
-// Virtualmin Driver options
-// -------------------------
-// No settings needed
-
-
 // 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 ea81f56fe..28f9d8201 100644
--- a/plugins/password/drivers/virtualmin.php
+++ b/plugins/password/drivers/virtualmin.php
@@ -41,17 +41,17 @@ class rcube_virtualmin_password
         // Get the domain using virtualmin CLI:
         exec("$curdir/chgvirtualminpasswd list-domains --mail-user $username --name-only", $output_domain, $returnvalue);
 
-        if ($returnvalue == 0 && count($output_domain) == 1)
-        {
+        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);
+
+            return PASSWORD_ERROR;
         }
 
         $domain   = escapeshellarg($domain);
@@ -65,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);