diff --git a/static/js/pandora/usersDialog.js b/static/js/pandora/usersDialog.js
index 5f51e07b..f4e81835 100644
--- a/static/js/pandora/usersDialog.js
+++ b/static/js/pandora/usersDialog.js
@@ -172,8 +172,8 @@ pandora.ui.usersDialog = function() {
                         width: 16
                     },
                     {
-                        format: function(value) {
-                            return value ? Ox.Element({
+                        format: function(value, data) {
+                            return Ox.Element({
                                     element: '<img>',
                                     tooltip: value
                                 })
@@ -186,7 +186,7 @@ pandora.ui.usersDialog = function() {
                                     borderRadius: '4px',
                                     marginLeft: '-3px',
                                     marginTop: 0
-                                }) : '';
+                                });
                         },
                         id: 'location',
                         operator: '+',
@@ -195,6 +195,37 @@ pandora.ui.usersDialog = function() {
                         visible: true,
                         width: 16
                     },
+                    {
+                        format: function(value) {
+                            var system;
+                            Ox.forEach(systems, function(s) {
+                                if (new RegExp('^' + s).test(value)) {
+                                    system = s;
+                                    return false;
+                                }
+                            });
+                            return system ? Ox.Element({
+                                    element: '<img>',
+                                    tooltip: value
+                                })
+                                .attr({
+                                    src: Ox.UI.PATH + 'png/system'
+                                        + system.replace(/ /g, '') + '128.png'
+                                })
+                                .css({
+                                    width: '14px',
+                                    height: '14px',
+                                    marginLeft: '-3px',
+                                    marginTop: 0
+                                }) : '';
+                        },
+                        id: 'system',
+                        operator: '+',
+                        title: 'System',
+                        titleImage: 'icon',
+                        visible: true,
+                        width: 16
+                    },
                     {
                         format: function(value) {
                             var browser;
@@ -226,37 +257,6 @@ pandora.ui.usersDialog = function() {
                         visible: true,
                         width: 16 
                     },
-                    {
-                        format: function(value) {
-                            var system;
-                            Ox.forEach(systems, function(s) {
-                                if (new RegExp('^' + s).test(value)) {
-                                    system = s;
-                                    return false;
-                                }
-                            });
-                            return system ? Ox.Element({
-                                    element: '<img>',
-                                    tooltip: value
-                                })
-                                .attr({
-                                    src: Ox.UI.PATH + 'png/system'
-                                        + system.replace(/ /g, '') + '128.png'
-                                })
-                                .css({
-                                    width: '14px',
-                                    height: '14px',
-                                    marginLeft: '-3px',
-                                    marginTop: 0
-                                }) : '';
-                        },
-                        id: 'system',
-                        operator: '+',
-                        title: 'System',
-                        titleImage: 'icon',
-                        visible: true,
-                        width: 16
-                    },
                     {
                         align: 'right',
                         format: function(value) {