diff --git a/src/ui_ng/src/app/group/add-group-modal/add-group-modal.component.html b/src/ui_ng/src/app/group/add-group-modal/add-group-modal.component.html
index d883b74bb..3f3c778c8 100644
--- a/src/ui_ng/src/app/group/add-group-modal/add-group-modal.component.html
+++ b/src/ui_ng/src/app/group/add-group-modal/add-group-modal.component.html
@@ -14,6 +14,7 @@
                     [class.invalid]="isDNInvalid">
                         <input type="text" id="ldap_group_dn" name="ldap_group_dn"
                         required
+                        [disabled]="mode !== 'create'"
                         [(ngModel)]="group.ldap_group_dn"
                         #groupDN="ngModel">
                         <span class="tooltip-content">
@@ -26,11 +27,19 @@
                     <label id="type">LDAP</label>
                 </div>
                 <div class="form-group">
-                    <label for="group_name">{{'GROUP.NAME' | translate}}</label>
-                    <label for="group_name">
+                    <label for="group_name" class="required">{{'GROUP.NAME' | translate}}</label>
+                    <label for="group_name"
+                    aria-haspopup="true"
+                    role="tooltip"
+                    class="tooltip tooltip-validation tooltip-sm tooltip-right"
+                    [class.invalid]="isNameInvalid">
                         <input type="text" id="group_name" name="group_name"
+                        required
                         [(ngModel)]="group.group_name"
-                        #groupDN="ngModel">
+                        #groupName="ngModel">
+                        <span class="tooltip-content">
+                            {{dnTooltip | translate}}
+                        </span>
                     </label>
                 </div>
             </section>
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 b6660c6dd..c6937cfe2 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
@@ -45,6 +45,10 @@ export class AddGroupModalComponent implements OnInit, OnDestroy {
     let dnControl = this.groupForm.controls['ldap_group_dn'];
     return  dnControl && dnControl.invalid && (dnControl.dirty || dnControl.touched);
   }
+  public get isNameInvalid(): boolean {
+    let dnControl = this.groupForm.controls['group_name'];
+    return  dnControl && dnControl.invalid && (dnControl.dirty || dnControl.touched);
+  }
 
   public get isFormValid(): boolean {
     return this.groupForm.valid;
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 e3af91e5e..337cf00b1 100644
--- a/src/ui_ng/src/i18n/lang/en-us-lang.json
+++ b/src/ui_ng/src/i18n/lang/en-us-lang.json
@@ -487,7 +487,7 @@
         "MAINTAINERS": "Maintainers",
         "PULLS": "Pull Count",
         "VERSION": "Version",
-        "APP_VERSION": "App Version",
+        "APP_VERSION": "Application Version",
         "INSTALL": "Install",
         "INSTALL_CHART": "Install Chart",
         "NAME": "Name",
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 b53abb19f..617cb86a1 100644
--- a/src/ui_ng/src/i18n/lang/es-es-lang.json
+++ b/src/ui_ng/src/i18n/lang/es-es-lang.json
@@ -486,7 +486,7 @@
         "MAINTAINERS": "Maintainers",
         "PULLS": "Pull Count",
         "VERSION": "Version",
-        "APP_VERSION": "App Version",
+        "APP_VERSION": "Application Version",
         "INSTALL": "Install",
         "INSTALL_CHART": "Install Chart",
         "NAME": "Name",
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 69e803b9b..de8361bb9 100644
--- a/src/ui_ng/src/i18n/lang/fr-fr-lang.json
+++ b/src/ui_ng/src/i18n/lang/fr-fr-lang.json
@@ -462,7 +462,7 @@
         "MAINTAINERS": "Maintainers",
         "PULLS": "Pull Count",
         "VERSION": "Version",
-        "APP_VERSION": "App Version",
+        "APP_VERSION": "Application Version",
         "INSTALL": "Install",
         "INSTALL_CHART": "Install Chart",
         "NAME": "Name",