diff --git a/clients/tools/ldappasswd.c b/clients/tools/ldappasswd.c
index 91dd6fb53b..d2e92702e9 100644
--- a/clients/tools/ldappasswd.c
+++ b/clients/tools/ldappasswd.c
@@ -257,6 +257,14 @@ main( int argc, char *argv[] )
 		usage( argv[0] );
 	} 
 
+	if (authmethod == -1) {
+#ifdef HAVE_CYRUS_SASL
+		authmethod = LDAP_AUTH_SASL;
+#else
+		authmethod = LDAP_AUTH_SIMPLE;
+#endif
+	}
+
 	dn = strdup( argv[optind] );
 
 	if( want_oldpw && oldpw == NULL ) {