diff --git a/perl-xCAT/xCAT/Schema.pm b/perl-xCAT/xCAT/Schema.pm
index 3b3e68f3b..712d075a6 100644
--- a/perl-xCAT/xCAT/Schema.pm
+++ b/perl-xCAT/xCAT/Schema.pm
@@ -1464,21 +1464,25 @@ my @nodeattrs = (
 ####################
  {attr_name => 'username',
                  only_if => 'nodetype=ivm',
+                 only_if => 'hwtype=ivm',
                  tabentry => 'ppchcp.username',
                  access_tabentry => 'ppchcp.hcp=attr:node',
                 },
  {attr_name => 'password',
                  only_if => 'nodetype=ivm',
+                 only_if => 'hwtype=ivm',
                  tabentry => 'ppchcp.password',
                  access_tabentry => 'ppchcp.hcp=attr:node',
                 },
  {attr_name => 'username',
                  only_if => 'nodetype=hmc',
+                 only_if => 'hwtype=hmc',
                  tabentry => 'ppchcp.username',
                  access_tabentry => 'ppchcp.hcp=attr:node',
                 },
  {attr_name => 'password',
                  only_if => 'nodetype=hmc',
+                 only_if => 'hwtype=hmc',
                  tabentry => 'ppchcp.password',
                  access_tabentry => 'ppchcp.hcp=attr:node',
                 },