diff --git a/ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.cpp b/ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.cpp
index df7ee3c5e..2fb7778e7 100644
--- a/ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.cpp
+++ b/ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.cpp
@@ -315,6 +315,9 @@ void ConnectionManager::unregisterAll(IConnection *connection)
 
 /**
 *   Register a device from a specific connection plugin
+*   @param devN contains the connection shortname + device name which is diplayed in the tooltip
+*  @param disp is the name that is displayed in the dropdown menu
+*  @param name is the actual device name
 */
 void ConnectionManager::registerDevice(IConnection *conn, const QString &devN, const QString &name, const QString &disp)
 {
@@ -344,7 +347,8 @@ void ConnectionManager::devChanged(IConnection *connection)
         foreach (IConnection::device dev, availableDev)
     {
         QString cbName = connection->shortName() + ": " + dev.name;
-        registerDevice(connection,cbName,dev.name,dev.displayName);
+        QString disp = connection->shortName() + " : " + dev.displayName;
+        registerDevice(connection,cbName,dev.name,disp);
     }
 
     //add all the list again to the combobox
diff --git a/ground/openpilotgcs/src/plugins/ipconnection/ipconnectionplugin.cpp b/ground/openpilotgcs/src/plugins/ipconnection/ipconnectionplugin.cpp
index c3a460b8d..5d166584c 100644
--- a/ground/openpilotgcs/src/plugins/ipconnection/ipconnectionplugin.cpp
+++ b/ground/openpilotgcs/src/plugins/ipconnection/ipconnectionplugin.cpp
@@ -164,7 +164,10 @@ QList <Core::IConnection::device> IPconnectionConnection::availableDevices()
 {
     QList <Core::IConnection::device> list;
     device d;
-    d.displayName=(const QString )m_config->HostName();
+    if (m_config->HostName().length()>1)
+        d.displayName=(const QString )m_config->HostName();
+    else
+        d.displayName="Unconfigured";
     d.name=(const QString )m_config->HostName();
     //we only have one "device" as defined by the configuration m_config
     list.append(d);