diff --git a/ldap-account-manager/entrypoint b/ldap-account-manager/entrypoint
index c952eea80aca1b51bdb814ef55073d1659f5ce64..626cbd11ed6f6a3eb84e507914407bae9e271a57 100755
--- a/ldap-account-manager/entrypoint
+++ b/ldap-account-manager/entrypoint
@@ -12,4 +12,4 @@ lam-setpass "$LAM_PASSWORD"
 unset LAM_PASSWORD
 
 # Start the process.
-eval exec "$@"
+eval exec "$*"
diff --git a/slapd/entrypoint b/slapd/entrypoint
index 401557cb8b3890d47e0fd36db85102dd96368e35..b861bbb190b249da3e2771cc9c34e6ce4eca9dce 100755
--- a/slapd/entrypoint
+++ b/slapd/entrypoint
@@ -69,4 +69,4 @@ EOF
 unset PASSWORD_HASH
 
 # Run CMD.
-eval exec "$@"
+eval exec "$*"