diff --git a/lib/cartodb/controllers/named_maps_admin.js b/lib/cartodb/controllers/named_maps_admin.js
index df24bdc2..1653c840 100644
--- a/lib/cartodb/controllers/named_maps_admin.js
+++ b/lib/cartodb/controllers/named_maps_admin.js
@@ -100,10 +100,10 @@ NamedMapsAdminController.prototype.checkContentType = function (action, label) {
 
 NamedMapsAdminController.prototype.create = function () {
     return function createTemplateMiddleware (req, res, next) {
-        const cdbuser = res.locals.user;
+        const { user } = res.locals;
         const template = req.body;
 
-        this.templateMaps.addTemplate(cdbuser, template, (err, templateId) => {
+        this.templateMaps.addTemplate(user, template, (err, templateId) => {
             if (err) {
                 return next(err);
             }
@@ -139,16 +139,16 @@ NamedMapsAdminController.prototype.retrieve =  function () {
     return function updateTemplateMiddleware (req, res, next) {
         req.profiler.start('windshaft-cartodb.get_template');
 
-        const cdbuser = res.locals.user;
+        const { user } = res.locals;
         const templateId = templateName(req.params.template_id);
 
-        this.templateMaps.getTemplate(cdbuser, templateId, (err, template) => {
+        this.templateMaps.getTemplate(user, templateId, (err, template) => {
             if (err) {
                 return next(err);
             }
 
             if (!template) {
-                const error = new Error(`Cannot find template '${templateId}' of user '${cdbuser}'`);
+                const error = new Error(`Cannot find template '${templateId}' of user '${user}'`);
                 error.http_status = 404;
                 return next(error);
             }