diff --git a/ayanova/src/components/pm-item-tasks.vue b/ayanova/src/components/pm-item-tasks.vue
index ecc32dfa..dcbff20b 100644
--- a/ayanova/src/components/pm-item-tasks.vue
+++ b/ayanova/src/components/pm-item-tasks.vue
@@ -145,7 +145,9 @@
             :items="pvm.selectLists.woItemTaskCompletionTypes"
             item-text="name"
             item-value="id"
-            :readonly="formState.readOnly || isDeleted"
+            :readonly="
+              formState.readOnly || isDeleted || isNotRestrictedUsersRecord
+            "
             :disabled="isDeleted"
             :label="$ay.t('WorkOrderItemTaskWorkOrderItemTaskCompletionType')"
             data-cy="usertype"
@@ -225,7 +227,7 @@
                 .completedDate
             "
             :label="$ay.t('WorkOrderItemTaskCompletedDate')"
-            :readonly="formState.readOnly"
+            :readonly="formState.readOnly || isNotRestrictedUsersRecord"
             :disabled="isDeleted"
             data-cy="travelCompletedDate"
             :error-messages="
@@ -449,6 +451,15 @@ export default {
     },
     canDeleteAll: function() {
       return this.pvm.rights.change && !this.value.userIsRestrictedType;
+    },
+    isNotRestrictedUsersRecord: function() {
+      if (this.value.userIsRestrictedType) {
+        return (
+          this.value.items[this.activeWoItemIndex].tasks[this.activeItemIndex]
+            .completedByUserId != this.$store.state.userId
+        );
+      }
+      return false;
     }
   },
   watch: {
diff --git a/ayanova/src/components/quote-item-tasks.vue b/ayanova/src/components/quote-item-tasks.vue
index a2cd2036..5ce1e8ee 100644
--- a/ayanova/src/components/quote-item-tasks.vue
+++ b/ayanova/src/components/quote-item-tasks.vue
@@ -145,7 +145,9 @@
             :items="pvm.selectLists.woItemTaskCompletionTypes"
             item-text="name"
             item-value="id"
-            :readonly="formState.readOnly || isDeleted"
+            :readonly="
+              formState.readOnly || isDeleted || isNotRestrictedUsersRecord
+            "
             :disabled="isDeleted"
             :label="$ay.t('WorkOrderItemTaskWorkOrderItemTaskCompletionType')"
             data-cy="usertype"
@@ -225,7 +227,7 @@
                 .completedDate
             "
             :label="$ay.t('WorkOrderItemTaskCompletedDate')"
-            :readonly="formState.readOnly"
+            :readonly="formState.readOnly || isNotRestrictedUsersRecord"
             :disabled="isDeleted"
             data-cy="travelCompletedDate"
             :error-messages="
@@ -447,6 +449,15 @@ export default {
     },
     canDeleteAll: function() {
       return this.pvm.rights.change && !this.value.userIsRestrictedType;
+    },
+    isNotRestrictedUsersRecord: function() {
+      if (this.value.userIsRestrictedType) {
+        return (
+          this.value.items[this.activeWoItemIndex].tasks[this.activeItemIndex]
+            .completedByUserId != this.$store.state.userId
+        );
+      }
+      return false;
     }
   },
   watch: {