diff --git a/password_change.cgi b/password_change.cgi
index f86dc0f9d..691294484 100755
--- a/password_change.cgi
+++ b/password_change.cgi
@@ -190,10 +190,11 @@ else {
 # Change password in Usermin too
 if (&get_product_name() eq 'usermin' &&
     &foreign_check("changepass")) {
-	# XXX remote user??
 	&foreign_require("changepass", "changepass-lib.pl");
 	&changepass::change_mailbox_passwords(
 		$in{'user'}, $in{'old'}, $in{'new1'});
+	&changepass::change_samba_password(
+		$in{'user'}, $in{'old'}, $in{'new1'});
 	}
 
 # Show ok page