diff --git a/servers/slapd/slappasswd.c b/servers/slapd/slappasswd.c
index 09892e3f0b..d664d347b6 100644
--- a/servers/slapd/slappasswd.c
+++ b/servers/slapd/slappasswd.c
@@ -241,6 +241,12 @@ slappasswd( int argc, char *argv[] )
 	}
 #endif
 
+	if ( !lutil_passwd_scheme( scheme ) ) {
+		fprintf( stderr, "Password scheme not recognised\n" );
+		rc = EXIT_FAILURE;
+		goto destroy;
+	}
+
 	if( pwfile != NULL ) {
 		if( lutil_get_filed_password( pwfile, &passwd )) {
 			rc = EXIT_FAILURE;