diff --git a/src/components/ModuleFields/Editor/base.vue b/src/components/ModuleFields/Editor/base.vue
index ac61d272a26947b747dff48e635ae8e0543d45c1..961bdd17b6913ba73691a31997d79178d32aaf31 100644
--- a/src/components/ModuleFields/Editor/base.vue
+++ b/src/components/ModuleFields/Editor/base.vue
@@ -85,11 +85,18 @@ export default {
 
     value: {
       get () {
+        if (this.field.isSystem) {
+          return this.record[this.field.name]
+        }
         return this.record.values[this.field.name]
       },
 
       set (value) {
-        this.record.values[this.field.name] = value
+        if (this.field.isSystem) {
+          this.record[this.field.name] = value
+        } else {
+          this.record.values[this.field.name] = value
+        }
       },
     },
 
diff --git a/src/components/PageBlocks/RecordEditor.vue b/src/components/PageBlocks/RecordEditor.vue
index 7ebdd5eaf6a90ef094dd53de5ba5034e4e0fd341..50b1bdeb460904c490f5764b10d68a59caaaf6bf 100644
--- a/src/components/PageBlocks/RecordEditor.vue
+++ b/src/components/PageBlocks/RecordEditor.vue
@@ -138,7 +138,7 @@ export default {
     isFieldEditable (field) {
       return field &&
         field.canUpdateRecordValue &&
-        !field.isSystem &&
+        (!field.isSystem || field.name === 'ownedBy') &&
         !(
           field.expressions &&
           field.expressions.value