diff --git a/target/bin/adddovecotmasteruser b/target/bin/adddovecotmasteruser
index 41041db2..d327478d 100755
--- a/target/bin/adddovecotmasteruser
+++ b/target/bin/adddovecotmasteruser
@@ -7,8 +7,7 @@ function _main() {
   _require_n_parameters_or_print_usage 1 "${@}"
 
   local MAIL_ACCOUNT="${1}"
-  shift
-  local PASSWD="${*}"
+  local PASSWD="${2}"
 
   _manage_accounts_dovecotmaster_create "${MAIL_ACCOUNT}" "${PASSWD}"
 }
diff --git a/target/bin/addsaslpassword b/target/bin/addsaslpassword
index 9461c112..1f37ef68 100755
--- a/target/bin/addsaslpassword
+++ b/target/bin/addsaslpassword
@@ -8,8 +8,7 @@ function _main() {
 
   local DOMAIN="${1}"
   local RELAY_ACCOUNT="${2}"
-  shift 2
-  local PASSWD="${*}"
+  local PASSWD="${2}"
 
   _validate_parameters
   _add_relayhost_credentials
diff --git a/target/bin/updatedovecotmasteruser b/target/bin/updatedovecotmasteruser
index eeff21a5..cc1ae930 100755
--- a/target/bin/updatedovecotmasteruser
+++ b/target/bin/updatedovecotmasteruser
@@ -7,8 +7,7 @@ function _main() {
   _require_n_parameters_or_print_usage 1 "${@}"
 
   local MAIL_ACCOUNT="${1}"
-  shift
-  local PASSWD="${*}"
+  local PASSWD="${2}"
 
   _manage_accounts_dovecotmaster_update "${MAIL_ACCOUNT}" "${PASSWD}"
 }
diff --git a/target/bin/updatemailuser b/target/bin/updatemailuser
index ce45533e..be1b981c 100755
--- a/target/bin/updatemailuser
+++ b/target/bin/updatemailuser
@@ -7,8 +7,7 @@ function _main() {
   _require_n_parameters_or_print_usage 1 "${@}"
 
   local MAIL_ACCOUNT="${1}"
-  shift
-  local PASSWD="${*}"
+  local PASSWD="${2}"
 
   _manage_accounts_update "${MAIL_ACCOUNT}" "${PASSWD}"
 }