diff --git a/changepass.pl b/changepass.pl
index e196c6c74..0e55ead2a 100755
--- a/changepass.pl
+++ b/changepass.pl
@@ -3,6 +3,7 @@
 # Script for the user to change their webmin password
 
 # Check command line arguments
+require "./acl/md5-lib.pl";
 usage() if (@ARGV != 3);
 ($config, $user, $pass) = @ARGV;
 if (!-d $config) {
@@ -18,6 +19,15 @@ while(<CONF>) {
 	if (/^([^=]+)=(\S+)/) { $config{$1} = $2; }
 	}
 close(CONF);
+if (!open(CONF, "<$config/config")) {
+	print STDERR "Failed to open $config/config : $!\n";
+	print STDERR "Maybe $config is not the Webmin config directory.\n";
+	exit 3;
+	}
+while(<CONF>) {
+	if (/^([^=]+)=(\S+)/) { $gconfig{$1} = $2; }
+	}
+close(CONF);
 
 # Update the users file
 if (!open(USERS, "<".$config{'userfile'})) {
@@ -39,9 +49,7 @@ if (!defined($uinfo)) {
 	print STDERR "The users on your system are: ",join(" ", @users),"\n";
 	exit 5;
 	}
-srand(time() ^ $$);
-$salt = chr(int(rand(26))+65).chr(int(rand(26))+65);
-$uinfo->[1] = crypt($pass, $salt);
+$uinfo->[1] = encrypt_password($pass);
 $uinfo->[6] = time();
 if (!open(USERS, ">$config{'userfile'}")) {
 	print STDERR "Failed to open Webmin users file $config{'userfile'} : $!\n";
@@ -69,6 +77,36 @@ else {
 	print STDERR "Webmin is not running - cannot refresh configuration\n";
 	}
 
+sub encrypt_password
+{
+my ($pass) = @_;
+if ($gconfig{'md5pass'} == 1) {
+	# Use MD5 encryption
+	return &encrypt_md5($pass);
+	}
+elsif ($gconfig{'md5pass'} == 2) {
+	# Use SHA512 encryption
+	return &encrypt_sha512($pass);
+	}
+else {
+	# Use Unix DES
+	srand(time() ^ $$);
+	$salt ||= chr(int(rand(26))+65).chr(int(rand(26))+65);
+	return &unix_crypt($pass, $salt);
+	}
+}
+
+sub unix_crypt
+{
+local ($pass, $salt) = @_;
+if ($use_perl_crypt) {
+	return Crypt::UnixCrypt::crypt($pass, $salt);
+	}
+else {
+	return crypt($pass, $salt);
+	}
+}
+
 sub usage
 {
 print STDERR <<EOF;