diff --git a/actions/ldap b/actions/ldap
index ed4d40f0d..c68c4ffce 100755
--- a/actions/ldap
+++ b/actions/ldap
@@ -24,13 +24,6 @@ fi
 
 set -e  # Exit on failure
 
-# XXX: ldapscripts has an issue that it can't properly extract
-# built-in templates under certain locales due to grep command
-# recognizing the source file as binary.  Remove using this once the
-# bug is fixed.  Passing '-a' as argument to grep seems to be a
-# solution.
-export LC_ALL=C
-
 
 create_user()
 {
@@ -79,14 +72,7 @@ set_user_password()
     username="$1"
     password=$(slappasswd -s "$2")
 
-    # XXX: Use ldapsetpasswd as soon as ldapscripts can handle
-    # changing passwords with SASL auth EXTERNAL.
-    cat <<EOF | ldapmodify -Y EXTERNAL -H ldapi:/// > /dev/null
-dn: uid=$username,ou=Users,dc=thisbox
-changetype: modify
-replace: userPassword
-userPassword: $password
-EOF
+    ldapsetpasswd "$username" "$password"
 }