diff --git a/src/ui_ng/src/app/config/auth/config-auth.component.html b/src/ui_ng/src/app/config/auth/config-auth.component.html
index 22e917349..7e3da81fb 100644
--- a/src/ui_ng/src/app/config/auth/config-auth.component.html
+++ b/src/ui_ng/src/app/config/auth/config-auth.component.html
@@ -202,7 +202,7 @@
             </clr-checkbox>
         </div>
     </section>
-    <section>
+    <section *ngIf="showLdap">
         <div class="form-group">
             <label for="ldapVerifyCert">{{'CONFIG.LDAP.VERIFY_CERT' | translate}}</label>
             <clr-checkbox name="ldapVerifyCert" id="ldapVerifyCert" [clrChecked]="currentConfig.ldap_verify_cert.value" [clrDisabled]="disabled(currentConfig.ldap_scope)"
diff --git a/src/ui_ng/src/app/group/add-group-modal/add-group-modal.component.ts b/src/ui_ng/src/app/group/add-group-modal/add-group-modal.component.ts
index 9a6fa9eae..b6660c6dd 100644
--- a/src/ui_ng/src/app/group/add-group-modal/add-group-modal.component.ts
+++ b/src/ui_ng/src/app/group/add-group-modal/add-group-modal.component.ts
@@ -95,7 +95,7 @@ export class AddGroupModalComponent implements OnInit, OnDestroy {
       .finally(() => this.close())
       .subscribe(
         res => {
-          this.msgHandler.showSuccess("ADD_GROUP_FAILURE");
+          this.msgHandler.showSuccess("GROUP.EDIT_GROUP_SUCCESS");
           this.dataChange.emit();
         },
         error => this.msgHandler.handleError(error)
diff --git a/src/ui_ng/src/i18n/lang/en-us-lang.json b/src/ui_ng/src/i18n/lang/en-us-lang.json
index fb32ce9ca..5b73c1e5d 100644
--- a/src/ui_ng/src/i18n/lang/en-us-lang.json
+++ b/src/ui_ng/src/i18n/lang/en-us-lang.json
@@ -264,7 +264,7 @@
         "PROPERTY": "Property",
         "REG_TIME": "Registration Time",
         "ADD_GROUP_SUCCESS": "Add group success",
-        "ADD_GROUP_FAILURE": "Add group failure",
+        "EDIT_GROUP_SUCCESS": "Edit group success",
         "LDAP_TYPE": "LDAP"
     },
     "AUDIT_LOG": {
diff --git a/src/ui_ng/src/i18n/lang/es-es-lang.json b/src/ui_ng/src/i18n/lang/es-es-lang.json
index b8a0041fc..42fa34ad4 100644
--- a/src/ui_ng/src/i18n/lang/es-es-lang.json
+++ b/src/ui_ng/src/i18n/lang/es-es-lang.json
@@ -263,7 +263,7 @@
         "PROPERTY": "Property",
         "REG_TIME": "Registration Time",
         "ADD_GROUP_SUCCESS": "Add group success",
-        "ADD_GROUP_FAILURE": "Add group failure",
+        "EDIT_GROUP_SUCCESS": "Edit group success",
         "LDAP_TYPE": "LDAP"
     },
     "AUDIT_LOG": {
diff --git a/src/ui_ng/src/i18n/lang/fr-fr-lang.json b/src/ui_ng/src/i18n/lang/fr-fr-lang.json
index 4e3b0ee30..e5563b1e1 100644
--- a/src/ui_ng/src/i18n/lang/fr-fr-lang.json
+++ b/src/ui_ng/src/i18n/lang/fr-fr-lang.json
@@ -247,7 +247,7 @@
         "PROPERTY": "Property",
         "REG_TIME": "Registration Time",
         "ADD_GROUP_SUCCESS": "Add group success",
-        "ADD_GROUP_FAILURE": "Add group failure",
+        "EDIT_GROUP_SUCCESS": "Edit group success",
         "LDAP_TYPE": "LDAP"
     },
     "AUDIT_LOG": {
diff --git a/src/ui_ng/src/i18n/lang/zh-cn-lang.json b/src/ui_ng/src/i18n/lang/zh-cn-lang.json
index 11cab510d..871b01547 100644
--- a/src/ui_ng/src/i18n/lang/zh-cn-lang.json
+++ b/src/ui_ng/src/i18n/lang/zh-cn-lang.json
@@ -263,7 +263,7 @@
         "GROUP_DN": "LDAP 组域",
         "REG_TIME": "注册时间",
         "ADD_GROUP_SUCCESS": "添加组成功",
-        "ADD_GROUP_FAILURE": "添加组失败",
+        "EDIT_GROUP_SUCCESS": "修改组成功",
         "LDAP_TYPE": "LDAP"
     },
     "AUDIT_LOG": {