diff --git a/lib/units/api/controllers/device.js b/lib/units/api/controllers/device.js
index a7190c39..703ccb67 100644
--- a/lib/units/api/controllers/device.js
+++ b/lib/units/api/controllers/device.js
@@ -31,7 +31,7 @@ function getDevices(req, res) {
     })
     .catch(function(err) {
       log.error('Failed to load device list: ', err.stack)
-      res.json(500, {
+      res.status(500).json({
         success: false
       })
     })
@@ -56,14 +56,14 @@ function getDeviceBySerial(req, res) {
         })
       }
       else {
-        res.json(404, {
+        res.status(404).json({
           success: false
         })
       }
     })
     .catch(function(err) {
       log.error('Failed to load device "%s": ', req.params.serial, err.stack)
-      res.json(500, {
+      res.status(500).json({
         success: false
       })
     })
diff --git a/lib/units/api/controllers/token.js b/lib/units/api/controllers/token.js
index 8452f84e..f123b6d9 100644
--- a/lib/units/api/controllers/token.js
+++ b/lib/units/api/controllers/token.js
@@ -26,7 +26,7 @@ function getAccessTokens(req, res) {
     })
     .catch(function(err) {
       log.error('Failed to load tokens: ', err.stack)
-      res.json(500, {
+      res.status(500).json({
         success: false
       })
     })
diff --git a/lib/units/api/controllers/user.js b/lib/units/api/controllers/user.js
index b0cb4df9..7a592836 100644
--- a/lib/units/api/controllers/user.js
+++ b/lib/units/api/controllers/user.js
@@ -41,7 +41,7 @@ function getCurrentUserDevices(req, res) {
     })
     .catch(function(err) {
       log.error('Failed to load group: ', err.stack)
-      res.json(500, {
+      res.status(500).json({
         success: false
       })
     })
@@ -79,19 +79,19 @@ function addDeviceToUser(req, res) {
             )
           ])
 
-          res.json(202, {
+          res.status(202).json({
             success: true
           , description: 'Device Add request is accepted'
           })
 
         } else {
-          res.json(500, {
+          res.status(500).json({
             success: false
           , description: 'Device is being used or not available'
           })
         }
       } else {
-        res.json(500, {
+        res.status(500).json({
           success: false
         , description: 'Bad device serial'
         })
@@ -124,19 +124,19 @@ function deleteDeviceFromUser(req, res) {
             )
           ])
 
-          res.json(202, {
+          res.status(202).json({
             success: true
           , description: 'Device Release request is accepted'
           })
 
         } else {
-          res.json(500, {
+          res.status(500).json({
             success: false
           , description: 'You cannot kick this device'
           })
         }
       } else {
-        res.json(500, {
+        res.status(500).json({
           success: false
         , description: 'Bad device serial'
         })
@@ -164,21 +164,21 @@ function getUserDeviceBySerial(req, res) {
           })
         }
         else {
-          res.json(404, {
+          res.status(404).json({
             success: false
           , description: 'device is not owned by you'
           })
         }
       }
       else {
-        res.json(404, {
+        res.status(404).json({
           success: false
         })
       }
     })
     .catch(function(err) {
       log.error('Failed to load device "%s": ', req.params.serial, err.stack)
-      res.json(500, {
+      res.status(500).json({
         success: false
       })
     })
@@ -200,20 +200,20 @@ function connectDeviceBySerial(req, res) {
             )
           ])
 
-          res.json(202, {
+          res.status(202).json({
             success: true
           , description: 'Device Connect request is accepted'
           })
         }
         else {
-          res.json(500, {
+          res.status(500).json({
             success: false
           , description: 'Device is not owned by you or is not available'
           })
         }
       }
       else {
-        res.json(404, {
+        res.status(404).json({
           success: false
         , description: 'Bad device serial'
         })
@@ -221,7 +221,7 @@ function connectDeviceBySerial(req, res) {
     })
     .catch(function(err) {
       log.error('Failed to load device "%s": ', req.params.serial, err.stack)
-      res.json(500, {
+      res.status(500).json({
         success: false
       })
     })
@@ -243,20 +243,20 @@ function disconnectDeviceBySerial(req, res) {
           )
           ])
 
-          res.json(202, {
+          res.status(202).json({
             success: true
           , description: 'Device Disonnect request is accepted'
           })
         }
         else {
-          res.json(500, {
+          res.status(500).json({
             success: false
           , description: 'Device is not owned by you or is not available'
           })
         }
       }
       else {
-        res.json(404, {
+        res.status(404).json({
           success: false
         , description: 'Bad device serial'
         })
@@ -264,7 +264,7 @@ function disconnectDeviceBySerial(req, res) {
     })
     .catch(function(err) {
       log.error('Failed to load device "%s": ', req.params.serial, err.stack)
-      res.json(500, {
+      res.status(500).json({
         success: false
       })
     })