diff --git a/xCAT-server/lib/xcat/plugins/dhcp.pm b/xCAT-server/lib/xcat/plugins/dhcp.pm
index 805f9c32f..c1b91c29d 100644
--- a/xCAT-server/lib/xcat/plugins/dhcp.pm
+++ b/xCAT-server/lib/xcat/plugins/dhcp.pm
@@ -1457,7 +1457,10 @@ sub process_request
         else
         {
             system("/etc/init.d/dhcpd restart");
-            system("chkconfig dhcpd on");
+            # should not chkconfig dhcpd on every makedhcp invoation
+            # it is not appropriate and will cause problem for HAMN
+            # do it in xcatconfig instead
+            #system("chkconfig dhcpd on");
         }
     }
     flock($dhcplockfd,LOCK_UN);
diff --git a/xCAT-server/sbin/xcatconfig b/xCAT-server/sbin/xcatconfig
index 4c2dd75e0..9f5f948b9 100755
--- a/xCAT-server/sbin/xcatconfig
+++ b/xCAT-server/sbin/xcatconfig
@@ -381,6 +381,10 @@ if ($::INITIALINSTALL || $::FORCE)
      &makenetworks;
      &setuphttp;
 
+     # chkconfig dhcpd on
+     system("chkconfig dhcpd on");
+
+
      my $linux_note =
       "xCAT is now running, it is recommended to tabedit networks \nand set a dynamic ip address range on any networks where nodes \nare to be discovered. Then, run makedhcp -n to create a new dhcpd \nconfiguration file, and \/etc\/init.d\/dhcpd restart. Either examine sample \nconfiguration templates, or write your own, or specify a value per \nnode with nodeadd or tabedit.";
      xCAT::MsgUtils->message('I', $linux_note);