diff --git a/ui/app/views/directives/flow/operation.html b/ui/app/views/directives/flow/operation.html
index 5fad899066..24480dda81 100644
--- a/ui/app/views/directives/flow/operation.html
+++ b/ui/app/views/directives/flow/operation.html
@@ -11,10 +11,10 @@
             </span>
         </span>
     </span>
-    <span class="operation-user">{{getUserInfo.get(base.user) | getField: 'name'}}</span>
+    <span class="operation-user">{{getUserInfo.get(base.createdBy) | getField: 'name'}}</span>
 
     <span class="operation-timer pull-right">
-        <i class="text-default glyphicon glyphicon-time"></i>        
+        <i class="text-default glyphicon glyphicon-time"></i>
     	<timer interval="30000" start-time="gtime(base.startDate)">
             {{millis  | amDurationFormat : 'milliseconds'}}
     	</timer>
diff --git a/ui/app/views/directives/flow/task-log.html b/ui/app/views/directives/flow/task-log.html
index 5652bca2e5..ede7bbdca0 100644
--- a/ui/app/views/directives/flow/task-log.html
+++ b/ui/app/views/directives/flow/task-log.html
@@ -1,7 +1,7 @@
 <div class="flow-task-log log-entry">
     <div class="flow-item-title wrap">
         <i class="glyphicon glyphicon-comment"></i>
-        <span ng-bind="getUserInfo.get(base.user) | getField: 'name'"></span>
+        <span ng-bind="getUserInfo.get(base.createdBy) | getField: 'name'"></span>
     </div>
     <div class="flow-item-updates wrap">
         <span ng-bind="base.details.message| limitTo: 250"></span>
diff --git a/ui/app/views/directives/log-entry.html b/ui/app/views/directives/log-entry.html
index e1f70d9e50..47f43875e4 100644
--- a/ui/app/views/directives/log-entry.html
+++ b/ui/app/views/directives/log-entry.html
@@ -3,7 +3,7 @@
 <div class="log-entry">
     <div class="row mb-xxs">
         <div class="col-md-6">
-            <user user-id="log.user" icon-size="xs"></user>
+            <user user-id="log.owner" icon-size="xs"></user>
         </div>
         <div class="col-md-6">
             <span class="pull-right">
diff --git a/ui/app/views/directives/search/case.html b/ui/app/views/directives/search/case.html
index 26e5363e4a..100d513527 100644
--- a/ui/app/views/directives/search/case.html
+++ b/ui/app/views/directives/search/case.html
@@ -5,7 +5,7 @@
 </div>
 <div>
     <i class="glyphicon glyphicon-user"></i>
-    <span>{{getUserInfo.get(value.user) | getField: 'name'}}</span>
+    <span>{{getUserInfo.get(value.owner) | getField: 'name'}}</span>
 
     <i class="glyphicon glyphicon-calendar ml-xxs"></i>
     <span ng-bind="value.startDate | showDate"></span>
diff --git a/ui/app/views/directives/search/observable-job.html b/ui/app/views/directives/search/observable-job.html
index 5375eb6b35..ac1937fafa 100644
--- a/ui/app/views/directives/search/observable-job.html
+++ b/ui/app/views/directives/search/observable-job.html
@@ -5,7 +5,7 @@
 </div>
 <div>
     <i class="glyphicon glyphicon-user"></i>
-    <span>{{getUserInfo.get(value.user) | getField: 'name'}}</span>
+    <span>{{getUserInfo.get(value.createdBy) | getField: 'name'}}</span>
 
     <i class="glyphicon glyphicon-calendar ml-xxs"></i>
     Started on <span ng-bind="value.startDate | showDate"> </span>
diff --git a/ui/app/views/directives/search/observable.html b/ui/app/views/directives/search/observable.html
index 4c776478fd..c9d6ba2fc6 100644
--- a/ui/app/views/directives/search/observable.html
+++ b/ui/app/views/directives/search/observable.html
@@ -9,7 +9,7 @@
 </div>
 <div>
     <i class="glyphicon glyphicon-user"></i>
-    <span>{{getUserInfo.get(value.user) | getField: 'name'}}</span>
+    <span>{{getUserInfo.get(value.createdBy) | getField: 'name'}}</span>
 
     <i class="glyphicon glyphicon-calendar ml-xxs"></i>
     <span ng-bind="value.startDate | showDate"></span>
diff --git a/ui/app/views/directives/search/task-log.html b/ui/app/views/directives/search/task-log.html
index 5eba6f121b..1c7b2b826d 100644
--- a/ui/app/views/directives/search/task-log.html
+++ b/ui/app/views/directives/search/task-log.html
@@ -1,6 +1,6 @@
 <div class="search-item-title">
     <a href ui-sref="app.case.tasks-item({caseId: value.case_task.case.id, itemId: value.case_task.id})">
-        Message by {{value.user}}
+        Message by {{value.owner}}
     </a>
 </div>
 <div>
diff --git a/ui/app/views/directives/search/task.html b/ui/app/views/directives/search/task.html
index 626070b72a..ad20a41ff2 100644
--- a/ui/app/views/directives/search/task.html
+++ b/ui/app/views/directives/search/task.html
@@ -5,7 +5,7 @@
 </div>
 <div>
     <i class="glyphicon glyphicon-user"></i>
-    <span>{{getUserInfo.get(value.user) | getField: 'name'}}</span>
+    <span>{{getUserInfo.get(value.owner) | getField: 'name'}}</span>
 
     <i class="glyphicon glyphicon-calendar ml-xxs"></i>
     <span ng-bind="value.startDate | showDate"></span>
diff --git a/ui/app/views/partials/case/case.merge.html b/ui/app/views/partials/case/case.merge.html
index 8351ea9bdc..3219a5a208 100644
--- a/ui/app/views/partials/case/case.merge.html
+++ b/ui/app/views/partials/case/case.merge.html
@@ -32,7 +32,7 @@ <h4>{{c.title}}</h4>
         <div>
             <span>
                 <i class="glyphicon glyphicon-user"></i>
-                <span ng-bind="dialog.getUserInfo.get(c.user) | getField: 'name'"></span>
+                <span ng-bind="dialog.getUserInfo.get(c.owner) | getField: 'name'"></span>
             </span>
             <span class="ml-xxs">
                 <i class="glyphicon glyphicon-calendar"></i>
diff --git a/ui/app/views/partials/case/case.panelinfo.html b/ui/app/views/partials/case/case.panelinfo.html
index 46d815771d..856f1793ab 100644
--- a/ui/app/views/partials/case/case.panelinfo.html
+++ b/ui/app/views/partials/case/case.panelinfo.html
@@ -19,7 +19,7 @@ <h3 class="box-title">
     <div class="box-body">
         <span>
             <i class="glyphicon glyphicon-user"></i>
-            Created by <span ng-bind="getUserInfo.get(caze.user) | getField: 'name'"></span>
+            Created by <span ng-bind="getUserInfo.get(caze.owner) | getField: 'name'"></span>
         </span>
         <span class="ml-xxs">
             <i class="glyphicon glyphicon-calendar"></i>