diff --git a/src/components/entity/EntityList.vue b/src/components/entity/EntityList.vue
index 2072f06..9058934 100644
--- a/src/components/entity/EntityList.vue
+++ b/src/components/entity/EntityList.vue
@@ -172,7 +172,7 @@
                   <div class="row">
                     <div
                       class="text-left form-group"
-                      :class="baseUrl === 'collection' ? 'col-6' : 'col-12'"
+                      :class="baseUrl === 'unit' ? 'col-6' : 'col-12'"
                     >
                       <label>
                         <span class="text-capitalize">{{ baseUrl }}</span> Name:
@@ -211,7 +211,7 @@
                     </div>
                     <div
                       class="col-6 text-left form-group"
-                      v-if="baseUrl === 'collection'"
+                      v-if="baseUrl === 'unit'"
                     >
                       <label>Task Manager:</label>
                       <select
@@ -219,8 +219,8 @@
                         v-model="entity.taskManager"
                         :disabled="
                           showEdit ||
-                            (baseUrl === 'collection' &&
-                              !accessControl._collection._update)
+                            (baseUrl === 'unit' &&
+                              !accessControl._unit._update)
                         "
                         :class="{
                           'error-border': submitted && !entity.taskManager,
diff --git a/src/service/entity-service.js b/src/service/entity-service.js
index 254416c..49cf6ee 100644
--- a/src/service/entity-service.js
+++ b/src/service/entity-service.js
@@ -25,16 +25,14 @@ export default class EntityService {
                 self.isDataChanged = false;
                 self.$bvToast.toast("Unit details updated successfully.", self.sharedService.successToastConfig);
             });
-        } else if (self.baseUrl === 'collection') {
-            self.submitted = true;
-
-            // Collection Validation rules
             if (!self.entity.name || !self.entity.taskManager) {
-
                 self.$bvToast.toast("Please provide required fields!", self.sharedService.erorrToastConfig);
                 return false;
-
             }
+        } else if (self.baseUrl === 'collection') {
+            self.submitted = true;
+
+            // Collection Validation rules
             if (!self.isCreatePage) {
                 self.collectionService.updateCollection(self.entity).then(response => {
                     self.$bvToast.toast("Collection details updated successfully", self.sharedService.successToastConfig);