diff --git a/lib/constants.js b/lib/constants.js
index 83f7107..d955013 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -32,7 +32,8 @@ var constants = {
     X_REAL_IP_HEADER: 'x-real-ip',
     CORRELATOR_HEADER: 'fiware-correlator',
 
-    GET_ROLES_PATH: '/user'
+    GET_ROLES_PATH: '/user',
+    NA: 'N/A'
 };
 
 
diff --git a/lib/fiware-pep-steelskin.js b/lib/fiware-pep-steelskin.js
index 6be28ed..3b1946f 100644
--- a/lib/fiware-pep-steelskin.js
+++ b/lib/fiware-pep-steelskin.js
@@ -79,7 +79,10 @@ function accountInfoError(error, req, res, next) {
                       ' | Token=' + req.headers['x-auth-token'] +
                       ' | Origin=' + req.connection.remoteAddress +
                       ' | UserId=' + req.userId +
+                      ' | ServiceId=' + req.serviceId +
+                      ' | UserName=' + req.userName +
                       ' | Service=' + req.service +
+                      ' | SubServiceId=' + req.subserviceId +
                       ' | SubService=' + req.subService +
                       ' | Action=' + req.action +
                       ' | Date=' + new Date().toJSON());
diff --git a/lib/middleware/proxy.js b/lib/middleware/proxy.js
index 86878da..a2f0dd2 100644
--- a/lib/middleware/proxy.js
+++ b/lib/middleware/proxy.js
@@ -201,6 +201,7 @@ function accountInfo(req, res, next) {
                               ' | Token=' + req.headers['x-auth-token'] +
                               ' | Origin=' + req.connection.remoteAddress +
                               ' | UserId=' + req.userId +
+                              ' | UserName=' + req.userName +
                               ' | ServiceId=' + req.serviceId +
                               ' | Service=' + req.service +
                               ' | SubServiceId=' + req.subserviceId +
diff --git a/lib/services/keystoneAuth.js b/lib/services/keystoneAuth.js
index a695d67..f95f813 100644
--- a/lib/services/keystoneAuth.js
+++ b/lib/services/keystoneAuth.js
@@ -191,6 +191,7 @@ function retrieveUser(req, callback) {
             req.serviceId = cachedValue.serviceId;
             req.domainName = cachedValue.domainName;
             req.userId = cachedValue.userId;
+            req.userName = cachedValue.userName;
 
             logger.debug('User value processed with value: %j', cachedValue);
 
@@ -245,9 +246,12 @@ function retrieveUser(req, callback) {
                     cachedValue = {
                         domainName: body.token.project.domain.name,
                         serviceId: body.token.project.domain.id,
-                        userId: body.token['OS-TRUST:trust'].trustor_user.id
+                        userId: body.token['OS-TRUST:trust'].trustor_user.id,
+                        userName: constants.NA
                     };
-
+                    if (body.token.user) {
+                        cachedValue.userName = body.token.user.name;
+                    }
                     innerCb(null, cachedValue);
 
                 } else if (body.token && body.token.user && body.token.user.domain &&
@@ -256,7 +260,8 @@ function retrieveUser(req, callback) {
                     cachedValue = {
                         domainName: body.token.user.domain.name,
                         serviceId: body.token.user.domain.id,
-                        userId: body.token.user.id
+                        userId: body.token.user.id,
+                        userName: body.token.user.name
                     };
 
                     req.userData = cachedValue;