diff --git a/db/changes/10503-november/00-greuge.userFK_userFk.sql b/db/changes/10503-november/00-greuge.userFK_userFk.sql
new file mode 100644
index 000000000..ec4bf3146
--- /dev/null
+++ b/db/changes/10503-november/00-greuge.userFK_userFk.sql
@@ -0,0 +1 @@
+ALTER TABLE `vn`.`greuge` CHANGE `userFK` `userFk` int(10) unsigned DEFAULT NULL NULL;
\ No newline at end of file
diff --git a/modules/client/back/models/greuge.js b/modules/client/back/models/greuge.js
index bd5f2865d..42820fd60 100644
--- a/modules/client/back/models/greuge.js
+++ b/modules/client/back/models/greuge.js
@@ -1,6 +1,21 @@
+const LoopBackContext = require('loopback-context');
+
 module.exports = function(Self) {
     require('../methods/greuge/sumAmount')(Self);
 
+    Self.observe('before save', function(ctx, next) {
+        const loopBackContext = LoopBackContext.getCurrentContext();
+
+        let userFk = loopBackContext.active.accessToken.userId;
+
+        if (ctx.instance)
+            ctx.instance.userFk = userFk;
+        else
+            ctx.data.userFk = userFk;
+
+        next();
+    });
+
     Self.validatesLengthOf('description', {
         max: 45,
         message: 'Description should have maximum of 45 characters'
diff --git a/modules/client/back/models/greuge.json b/modules/client/back/models/greuge.json
index 918ff0ca5..625bf4e28 100644
--- a/modules/client/back/models/greuge.json
+++ b/modules/client/back/models/greuge.json
@@ -2,9 +2,9 @@
     "name": "Greuge",
     "base": "Loggable",
     "log": {
-      "model": "ClientLog",
-      "relation": "client",
-      "showField": "description"
+        "model": "ClientLog",
+        "relation": "client",
+        "showField": "description"
     },
     "options": {
         "mysql": {
@@ -35,7 +35,6 @@
             "type": "number",
             "required": true
         }
-
     },
     "relations": {
         "client": {
@@ -52,6 +51,11 @@
             "type": "belongsTo",
             "model": "GreugeType",
             "foreignKey": "greugeTypeFk"
+        },
+        "user": {
+            "type": "belongsTo",
+            "model": "Account",
+            "foreignKey": "userFk"
         }
     }
 }
\ No newline at end of file
diff --git a/modules/client/front/greuge/index/index.html b/modules/client/front/greuge/index/index.html
index b48fe9466..459d92fc7 100644
--- a/modules/client/front/greuge/index/index.html
+++ b/modules/client/front/greuge/index/index.html
@@ -29,6 +29,7 @@
                 <vn-thead>
                     <vn-tr>
                         <vn-th field="shipped" default-order="DESC" expand>Date</vn-th>
+                        <vn-th field="userFk">Created by</vn-thfield></vn-th>
                         <vn-th field="description">Comment</vn-th>
                         <vn-th field="greugeTypeFk">Type</vn-th>
                         <vn-th field="amount" number>Amount</vn-th>
@@ -37,6 +38,8 @@
                 <vn-tbody>
                     <vn-tr ng-repeat="greuge in greuges">
                         <vn-td shrink-datetime>{{::greuge.shipped | date:'dd/MM/yyyy HH:mm' }}</vn-td>
+                        <vn-td><span ng-click="workerDescriptor.show($event, greuge.user.id)"
+                        class="link">{{::greuge.user.name}}</span></vn-td>
                         <vn-td>
                             <span title="{{::greuge.description}}">{{::greuge.description}}</span>
                         </vn-td>
@@ -57,3 +60,4 @@
     vn-bind="+"
     fixed-bottom-right>
 </vn-float-button>
+<vn-worker-descriptor-popover vn-id="workerDescriptor"></vn-worker-descriptor-popover>
\ No newline at end of file
diff --git a/modules/client/front/greuge/index/index.js b/modules/client/front/greuge/index/index.js
index 2451167a4..7a5ccc531 100644
--- a/modules/client/front/greuge/index/index.js
+++ b/modules/client/front/greuge/index/index.js
@@ -8,6 +8,12 @@ class Controller extends Section {
             include: [
                 {
                     relation: 'greugeType',
+                    scope: {
+                        fields: ['id', 'name']
+                    },
+                },
+                {
+                    relation: 'user',
                     scope: {
                         fields: ['id', 'name']
                     }
diff --git a/modules/client/front/greuge/index/locale/es.yml b/modules/client/front/greuge/index/locale/es.yml
index 513e6ff7b..d1f202862 100644
--- a/modules/client/front/greuge/index/locale/es.yml
+++ b/modules/client/front/greuge/index/locale/es.yml
@@ -1,4 +1,5 @@
 Date: Fecha
 Comment: Comentario
 Amount: Importe
-Type: Tipo
\ No newline at end of file
+Type: Tipo
+Created by: Creado por
\ No newline at end of file