diff --git a/api/v1/entries/hostheartbeat.php b/api/v1/entries/hostheartbeat.php
index b2862521f1..cec8180eca 100644
--- a/api/v1/entries/hostheartbeat.php
+++ b/api/v1/entries/hostheartbeat.php
@@ -78,6 +78,9 @@ class hostHeartbeatEntry extends baseEntry
                     'status'    => $vm->status,
                     'extranet'  => $vm->ip,
                 );
+                
+                if(!$vm->sshPortOnHost) unset($vmData['ssh']);
+
                 if($heartbeat > 0) $vmData['heartbeat'] = date("Y-m-d H:i:s", $heartbeat);
                 
                 $this->dao->update(TABLE_ZAHOST)->data($vmData)->where('mac')->eq($vm->macAddress)->exec();
diff --git a/module/zahost/css/view.css b/module/zahost/css/view.css
index a01465a8bb..5d092fc6e2 100644
--- a/module/zahost/css/view.css
+++ b/module/zahost/css/view.css
@@ -20,3 +20,4 @@
 .btn-info {background-color: unset;}
 .icon-refresh {font-size: 15px;}
 .load-indicator:after {top: 33%;}
+.btn.disabled i {color: #fff;}
diff --git a/module/zahost/view/view.html.php b/module/zahost/view/view.html.php
index ab54e22f53..d78b9e23d9 100644
--- a/module/zahost/view/view.html.php
+++ b/module/zahost/view/view.html.php
@@ -131,9 +131,15 @@
         <div class="detail-title"><?php echo $lang->zahost->desc;?></div>
         <div class="detail-content article-content"><?php echo !empty($zahost->desc) ? htmlspecialchars_decode($zahost->desc) : $lang->noData;?></div>
       </div>
-      <?php if(!empty($nodeList)): ?>
+      <?php
+      $canBeChanged = common::canBeChanged('zahost', $zahost);
+      if($canBeChanged) $actionFormLink = $this->createLink('action', 'comment', "objectType=zahost&objectID=$zahost->hostID");
+      ?>
+    </div>
+    <div class="cell">
       <div class="detail">
         <div class="detail-title"><?php echo $lang->zahost->browseNode;?></div>
+        <?php if(!empty($nodeList)): ?>
         <div class="detail-content article-content">
         <?php echo "<iframe width='100%' id='nodesIframe' src='" . $this->createLink('zanode', 'list', "hostID=$zahost->id", '', true) . "' frameborder='no' allowfullscreen='true' mozallowfullscreen='true' webkitallowfullscreen='true' allowtransparency='true' scrolling='auto' onload='setIframeHeight(this)' style='min-height:300px;'></iframe>";?>
           <!-- <table class='table has-sort-head table-fixed' id='nodeList'>
@@ -161,6 +167,8 @@
             </tbody>
           </table> -->
         </div>
+        <?php else: ?>
+        <div class="detail-content article-content"><?php echo $lang->noData;?></div>
       </div>
       <?php endif; ?>
       <?php
diff --git a/module/zanode/css/view.css b/module/zanode/css/view.css
index ae56845864..e89553f2ce 100644
--- a/module/zanode/css/view.css
+++ b/module/zanode/css/view.css
@@ -16,3 +16,4 @@
 .checkStatus{color: #313c52;}
 .node-not-wrap{white-space: nowrap;}
 .btn-info {background-color: unset;}
+.btn.disabled i {color: #fff;}
diff --git a/module/zanode/view/view.html.php b/module/zanode/view/view.html.php
index b5a2a99303..2aec77c69a 100644
--- a/module/zanode/view/view.html.php
+++ b/module/zanode/view/view.html.php
@@ -55,7 +55,7 @@ $account = strpos($zanode->osName, "windows") ? $config->zanode->defaultWinAccou
             <div class="col-4">
               <div class="main-row">
                 <div class="col-3 text-right"><?php echo $lang->zanode->sshAddress; ?>:</div>
-                <div class="col-8 node-not-wrap">ssh <?php echo $account . '@' . $zanode->ip . ' -p ' . $zanode->ssh; ?><?php echo " <button type='button' class='btn btn-info btn-mini btn-ssh-copy'><i class='icon-common-copy icon-copy' title='" . $lang->zanode->copy .  "'></i></button>"; ?></div>
+                <div class="col-8 node-not-wrap"><?php echo $zanode->ssh ? 'ssh ' . $account . '@' . $zanode->ip . ' -p ' . $zanode->ssh : ''; ?><?php echo $zanode->ssh ? " <button type='button' class='btn btn-info btn-mini btn-ssh-copy'><i class='icon-common-copy icon-copy' title='" . $lang->zanode->copy .  "'></i></button>" : ''; ?></div>
               </div>
               <textarea style="display:none;" id="ssh-copy">ssh <?php echo $account . '@' . $zanode->ip . ' -p ' . $zanode->ssh; ?></textarea>
             </div>
@@ -96,7 +96,7 @@ $account = strpos($zanode->osName, "windows") ? $config->zanode->defaultWinAccou
             <div class="col-4">
               <div class="main-row">
                 <div class="col-3 text-right"><?php echo $lang->zanode->defaultPwd; ?>:</div>
-                <div class="col-8"><?php echo $config->zanode->defaultPwd . ' ' . "<button type='button' class='btn btn-info btn-mini btn-pwd-copy'><i class='icon-common-copy icon-copy' title='" . $lang->zanode->copy .  "'></i></button>"; ?></div>
+                <div class="col-8"><?php echo str_repeat('*', strlen($config->zanode->defaultPwd)) . ' ' . "<button type='button' class='btn btn-info btn-mini btn-pwd-copy'><i class='icon-common-copy icon-copy' title='" . $lang->zanode->copy .  "'></i></button>"; ?></div>
                 <textarea style="display:none;" id="pwd-copy"><?php echo $config->zanode->defaultPwd; ?></textarea>
               </div>
             </div>