diff --git a/submodules/users/users.js b/submodules/users/users.js
index 038db74..a076986 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -391,6 +391,7 @@ define(function(require) {
 
 				if (userId in mapUsers) {
 					var isRegistered = device.enabled && (['sip_device', 'smartphone', 'softphone', 'fax', 'ata'].indexOf(device.device_type) >= 0 ? registeredDevices.indexOf(device.id) >= 0 : true);
+					var isEnabled = device.enabled;
 
 					if (mapUsers[userId].extra.devices.length >= 2) {
 						if (mapUsers[userId].extra.additionalDevices === 0) {
@@ -401,7 +402,7 @@ define(function(require) {
 						}
 
 						mapUsers[userId].extra.additionalDevices.count++;
-						mapUsers[userId].extra.additionalDevices.tooltip += '<i class="device-popover-icon ' + self.deviceIcons[device.device_type] + (isRegistered ? ' monster-green' : ' monster-red') + '"></i>'
+						mapUsers[userId].extra.additionalDevices.tooltip += '<i class="device-popover-icon ' + self.deviceIcons[device.device_type] + (isEnabled ? (isRegistered ? ' monster-green' : ' monster-red') : ' monster-grey') + '"></i>'
 																			+ device.name + ' (' + device.device_type.replace('_', ' ') + ')<br>';
 					}
 
@@ -410,6 +411,7 @@ define(function(require) {
 						name: device.name + ' (' + device.device_type.replace('_', ' ') + ')',
 						type: device.device_type,
 						registered: isRegistered,
+						enabled: isEnabled,
 						icon: self.deviceIcons[device.device_type]
 					};
 
diff --git a/views/users-row.html b/views/users-row.html
index f34dbc6..55d6026 100644
--- a/views/users-row.html
+++ b/views/users-row.html
@@ -26,7 +26,7 @@
 		<div class="devices grid-cell" data-type="devices">
 			{{#each extra.devices}}
 				{{#compare @index "<" 2}}
-					<i class="{{this.icon}} {{#if this.registered}}monster-green{{else}}monster-red{{/if}} help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{ this.name }}"></i>
+					<i class="{{this.icon}} {{#if this.enabled}}{{#if this.registered}}monster-green{{else}}monster-red{{/if}}{{else}}monster-grey{{/if}} help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{ this.name }}"></i>
 				{{/compare}}
 			{{else}}
 				{{ i18n.users.noUserDevices }}