diff --git a/server/core/adminusers.cc b/server/core/adminusers.cc
index fc733a46b..104bbbee0 100644
--- a/server/core/adminusers.cc
+++ b/server/core/adminusers.cc
@@ -579,17 +579,25 @@ admin_verify_inet_user(const char *username, const char *password)
  */
 void dcb_PrintAdminUsers(DCB *dcb)
 {
-    dcb_printf(dcb, "Enabled Linux accounts (secure):\n");
+    dcb_printf(dcb, "Enabled Linux accounts (secure)    : ");
 
     if (linux_users)
     {
         users_diagnostic(dcb, linux_users);
     }
+    else
+    {
+        dcb_printf(dcb, "\n");
+    }
 
-    dcb_printf(dcb, "Created network accounts (insecure):\n");
+    dcb_printf(dcb, "Created network accounts (insecure): ");
 
     if (inet_users)
     {
         users_diagnostic(dcb, inet_users);
     }
+    else
+    {
+        dcb_printf(dcb, "\n");
+    }
 }
diff --git a/server/core/users.cc b/server/core/users.cc
index 5231f80d1..440f21c80 100644
--- a/server/core/users.cc
+++ b/server/core/users.cc
@@ -88,8 +88,6 @@ public:
     {
         if (m_data.size())
         {
-
-            dcb_printf(dcb, "User names: ");
             const char *sep = "";
 
             for (UserMap::const_iterator it = m_data.begin(); it != m_data.end(); it++)
@@ -99,10 +97,11 @@ public:
             }
             dcb_printf(dcb, "\n");
         }
-        else
-        {
-            dcb_printf(dcb, "Users table is empty\n");
-        }
+    }
+
+    bool empty() const
+    {
+        return m_data.size() > 0;
     }
 
 private:
@@ -170,7 +169,17 @@ void users_default_diagnostic(DCB* dcb, SERV_LISTENER* port)
 {
     if (port->users)
     {
-        users_diagnostic(dcb, port->users);
+        Users* u = reinterpret_cast<Users*>(port->users);
+
+        if (u->empty())
+        {
+            dcb_printf(dcb, "Users table is empty\n");
+        }
+        else
+        {
+            dcb_printf(dcb, "User names: ");
+            users_diagnostic(dcb, port->users);
+        }
     }
 }