diff --git a/xCAT-server/lib/xcat/plugins/credentials.pm b/xCAT-server/lib/xcat/plugins/credentials.pm
index 04c321c60..9a5360db1 100644
--- a/xCAT-server/lib/xcat/plugins/credentials.pm
+++ b/xCAT-server/lib/xcat/plugins/credentials.pm
@@ -320,6 +320,9 @@ sub process_request
            @filecontent=();
        }
     }
+     `logger -t xcat -p local4.info "credentials: remove $client from known_hosts"` ;
+    system("ssh-keygen -R $client -f /root/.ssh/known_hosts");
+
     if (defined $rsp->{data}->[0]) {
 	#if we got the data from the file, send the data message to the client
         xCAT::MsgUtils->message("D", $rsp, $callback, 0);