diff --git a/xCAT-server/lib/perl/xCAT/PasswordUtils.pm b/xCAT-server/lib/perl/xCAT/PasswordUtils.pm
index 1dbb88c0b..d9647deec 100644
--- a/xCAT-server/lib/perl/xCAT/PasswordUtils.pm
+++ b/xCAT-server/lib/perl/xCAT/PasswordUtils.pm
@@ -149,11 +149,6 @@ sub crypt_system_password {
             "ERROR: Unable to get password from database table $table, key=$key");
         return undef;
     }
-    if (($password =~ /^\$1\$/) || ($password =~ /^\$5\$/) || ($password =~ /^\$6\$/)) {
-        # pre-crypted for our convenience
-        return $password;
-    }
-
     $cryptmethod = $data->{'cryptmethod'};
     if (!$cryptmethod) {
         # Use sha256 crypt method by default