diff --git a/perl-xCAT/xCAT/NetworkUtils.pm b/perl-xCAT/xCAT/NetworkUtils.pm
index 093733fa3..94fde864a 100755
--- a/perl-xCAT/xCAT/NetworkUtils.pm
+++ b/perl-xCAT/xCAT/NetworkUtils.pm
@@ -429,6 +429,11 @@ sub ishostinsubnet {
     if ($ip =~ /:/) {#ipv6
         $numbits=128;
     }
+    # IPv6 subnet with netmask postfix like /64
+    if ($subnet =~ /\//)
+    {
+        $subnet =~ s/\/.*$//;
+    }
     if ($mask) {
 	if ($mask =~ /\//) {
 	    $mask =~ s/^\///;
diff --git a/xCAT-server/lib/xcat/plugins/blade.pm b/xCAT-server/lib/xcat/plugins/blade.pm
index 6a042416b..68d31889b 100644
--- a/xCAT-server/lib/xcat/plugins/blade.pm
+++ b/xCAT-server/lib/xcat/plugins/blade.pm
@@ -4568,8 +4568,6 @@ sub passwd {
         }
         return ([1, @data]);
     }
-    # setting the password expire time to 0, never expired
-    $t->cmd("accseccfg -pe 0 -T system:$mm"); 
     
     $mpatab->setAttribs({mpa=>$mpa,username=>$user},{password=>$pass});
     if ($user eq "USERID") {