diff --git a/src/ui_ng/lib/src/create-edit-endpoint/create-edit-endpoint.component.ts b/src/ui_ng/lib/src/create-edit-endpoint/create-edit-endpoint.component.ts
index 38611fa36..967994275 100644
--- a/src/ui_ng/lib/src/create-edit-endpoint/create-edit-endpoint.component.ts
+++ b/src/ui_ng/lib/src/create-edit-endpoint/create-edit-endpoint.component.ts
@@ -262,10 +262,11 @@ export class CreateEditEndpointComponent implements AfterViewChecked, OnDestroy
             delete payload[prop];
         }
         let changes: {[key: string]: any} = this.getChanges();
-        let changekeys: {[key: string]: any} = Object.keys(this.getChanges());
         if (isEmptyObject(changes)) {
             return;
         }
+        let changekeys: {[key: string]: any} = Object.keys(changes);
+
         changekeys.forEach((key: string) => {
             payload[key] = changes[key];
         });
diff --git a/src/ui_ng/lib/src/create-edit-rule/create-edit-rule.component.html.ts b/src/ui_ng/lib/src/create-edit-rule/create-edit-rule.component.html.ts
index 9cd0b7b1a..1def3e7fe 100644
--- a/src/ui_ng/lib/src/create-edit-rule/create-edit-rule.component.html.ts
+++ b/src/ui_ng/lib/src/create-edit-rule/create-edit-rule.component.html.ts
@@ -74,7 +74,7 @@ export const CREATE_EDIT_RULE_TEMPLATE: string = `
         </div>
         <div class="form-group">
           <label for="destination_insecure" class="col-md-4 form-group-label-override">{{'CONFIG.VERIFY_REMOTE_CERT' | translate }}</label>
-          <clr-checkbox #insecure  class="col-md-8" name="insecure" id="destination_insecure" [clrDisabled]="testOngoing"  [clrChecked]="!createEditRule.insecure"  [clrDisabled]="readonly || !isCreateEndpoint" (clrCheckedChange)="setInsecureValue($event)">
+          <clr-checkbox #insecure  class="col-md-8" name="insecure" id="destination_insecure" [clrChecked]="!createEditRule.insecure"  [clrDisabled]="readonly || !isCreateEndpoint || testOngoing" (clrCheckedChange)="setInsecureValue($event)">
              <a href="javascript:void(0)" role="tooltip" aria-haspopup="true" class="tooltip tooltip-top-right" style="top:-7px;">
                     <clr-icon shape="info-circle" class="info-tips-icon" size="24"></clr-icon>
                     <span class="tooltip-content">{{'CONFIG.TOOLTIP.VERIFY_REMOTE_CERT' | translate}}</span>
diff --git a/src/ui_ng/lib/src/create-edit-rule/create-edit-rule.component.ts b/src/ui_ng/lib/src/create-edit-rule/create-edit-rule.component.ts
index 386cfa6a7..64c367732 100644
--- a/src/ui_ng/lib/src/create-edit-rule/create-edit-rule.component.ts
+++ b/src/ui_ng/lib/src/create-edit-rule/create-edit-rule.component.ts
@@ -424,6 +424,9 @@ export class CreateEditRuleComponent implements AfterViewChecked {
       pingTarget.password = this.createEditRule.password;
       pingTarget.insecure = this.createEditRule.insecure;
     } else {
+      for (let prop in pingTarget) {
+        delete pingTarget[prop];
+      }
       pingTarget.id = this.createEditRule.endpointId;
     }
     toPromise<Endpoint>(this.endpointService
diff --git a/src/ui_ng/package.json b/src/ui_ng/package.json
index aa8a05d31..45c377d47 100644
--- a/src/ui_ng/package.json
+++ b/src/ui_ng/package.json
@@ -31,7 +31,7 @@
         "clarity-icons": "^0.9.8",
         "clarity-ui": "^0.9.8",
         "core-js": "^2.4.1",
-        "harbor-ui": "0.5.16",
+        "harbor-ui": "0.5.27",
         "intl": "^1.2.5",
         "mutationobserver-shim": "^0.3.2",
         "ngx-cookie": "^1.0.0",