diff --git a/perl-xCAT/xCAT/Schema.pm b/perl-xCAT/xCAT/Schema.pm
index 1893c91f1..c0979766b 100644
--- a/perl-xCAT/xCAT/Schema.pm
+++ b/perl-xCAT/xCAT/Schema.pm
@@ -1483,25 +1483,16 @@ my @nodeattrs = (
                  access_tabentry => 'ppchcp.hcp=attr:node',
                 },
  {attr_name => 'username',
-                 only_if => 'hwtype=ivm',
+                 only_if => 'nodetype=ppc',
                  tabentry => 'ppchcp.username',
                  access_tabentry => 'ppchcp.hcp=attr:node',
                 },
  {attr_name => 'password',
-                 only_if => 'hwtype=ivm',
-                 tabentry => 'ppchcp.password',
-                 access_tabentry => 'ppchcp.hcp=attr:node',
-                },
- {attr_name => 'username',
-                 only_if => 'hwtype=hmc',
-                 tabentry => 'ppchcp.username',
-                 access_tabentry => 'ppchcp.hcp=attr:node',
-                },
- {attr_name => 'password',
-                 only_if => 'hwtype=hmc',
+                 only_if => 'nodetype=ppc',
                  tabentry => 'ppchcp.password',
                  access_tabentry => 'ppchcp.hcp=attr:node',
                 },
+
 ####################
 #  ppc table       #
 ####################