diff --git a/useradmin/md5-lib.pl b/useradmin/md5-lib.pl
index c8250114e..4c6069ace 100755
--- a/useradmin/md5-lib.pl
+++ b/useradmin/md5-lib.pl
@@ -29,11 +29,11 @@ sub encrypt_md5
 {
 my ($passwd, $salt) = @_;
 my $magic = '$1$';
-if ($salt =~ /^\$1\$([^\$]+)/) {
+if ($salt && $salt =~ /^\$1\$([^\$]+)/) {
 	# Extract actual salt from already encrypted password
 	$salt = $1;
 	}
-if ($salt !~ /^[a-z0-9\/\.]{8}$/i) {
+if ($salt && $salt !~ /^[a-z0-9\/\.]{8}$/i) {
 	# Non-MD5 salt
 	$salt = undef;
 	}