diff --git a/cluster-passwd/change-passwd.pl b/cluster-passwd/change-passwd.pl
index ce09e04fc..a37699fff 100755
--- a/cluster-passwd/change-passwd.pl
+++ b/cluster-passwd/change-passwd.pl
@@ -48,7 +48,7 @@ $again =~ s/\r|\n//g;
 $pass eq $again || &errordie("Passwords don't match");
 
 # Check password sanity
-$err = &useradmin::check_password_restrictions($pass, $ARGV[0]);
+$err = &useradmin::check_password_restrictions($pass, $ARGV[0], $user);
 &errordie($err) if ($err);
 
 # Do it on all servers
diff --git a/cluster-passwd/save_passwd.cgi b/cluster-passwd/save_passwd.cgi
index 13b04e598..c5b2a9153 100755
--- a/cluster-passwd/save_passwd.cgi
+++ b/cluster-passwd/save_passwd.cgi
@@ -22,7 +22,7 @@ if ($access{'repeat'}) {
 	$in{'new'} eq $in{'repeat'} || &error($passwd::text{'passwd_erepeat'});
 	}
 $err = &useradmin::check_password_restrictions(
-	$in{'new'}, $user->{'user'});
+	$in{'new'}, $user->{'user'}, $user);
 &error($err) if ($err);
 
 # Output header
diff --git a/cluster-useradmin/save_user.cgi b/cluster-useradmin/save_user.cgi
index 5d3251176..dbdcfa9c2 100755
--- a/cluster-useradmin/save_user.cgi
+++ b/cluster-useradmin/save_user.cgi
@@ -62,7 +62,7 @@ $in{'home_def'} || $in{'home'} =~ /^\// ||
 # Validate password
 if ($in{'passmode'} == 3) {
 	local $err = &useradmin::check_password_restrictions(
-			$in{'pass'}, $user{'user'});
+			$in{'pass'}, $user{'user'}, \%user);
 	&error($err) if ($err);
 	}