diff --git a/AUTHORS.md b/AUTHORS.md
index 4a46179ac..1aa5c18ff 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -82,6 +82,7 @@ LibreNMS contributors:
 - Adam Winberg <adam.winberg@gmail.com> (wiad)
 - Maximilian Wilhelm <max@rfc2324.org> (BarbarossaTM)
 - Jameson Finney <jameson.finney@gmail.com> (JamesonFinney)
+- John Wells <john.wells@greatworx.com> (jbwiv)
 
 [1]: http://observium.org/ "Observium web site"
 Observium was written by:
diff --git a/html/pages/delsrv.inc.php b/html/pages/delsrv.inc.php
index a4c9e7da1..444b96037 100644
--- a/html/pages/delsrv.inc.php
+++ b/html/pages/delsrv.inc.php
@@ -13,7 +13,14 @@ else {
     }
 
     foreach (dbFetchRows('SELECT * FROM `services` AS S, `devices` AS D WHERE S.device_id = D.device_id ORDER BY hostname') as $device) {
-        $servicesform .= "<option value='".$device['service_id']."'>".$device['service_id'].'.'.$device['hostname'].' - '.$device['service_type'].'</option>';
+        $service_description = '';
+
+        if (!empty($device['service_desc'])) {
+            $service_description = ' - ' . substr($device['service_desc'], 0, 30);
+        }
+
+        $servicesform .= "<option value='".$device['service_id']."'>".$device['hostname'].' - '.$device['service_type'].$service_description.'</option>';
+
     }
 
     if ($updated) {
@@ -26,7 +33,7 @@ else {
   <input type=hidden name='delsrv' value='yes'>
   <div class='well well-lg'>
     <div class='form-group'>
-      <label for='service' class='col-sm-2 control-label'>Device - Service</label>
+      <label for='service' class='col-sm-2 control-label'>Device - Service - Description</label>
       <div class='col-sm-5'>
         <select name='service' id='service' class='form-control input-sm'>
           $servicesform
diff --git a/html/pages/editsrv.inc.php b/html/pages/editsrv.inc.php
index 1c04e4510..02cd59b5d 100644
--- a/html/pages/editsrv.inc.php
+++ b/html/pages/editsrv.inc.php
@@ -13,7 +13,13 @@ else {
     }
 
     foreach (dbFetchRows('SELECT * FROM `services` AS S, `devices` AS D WHERE S.device_id = D.device_id ORDER BY hostname') as $device) {
-        $servicesform .= "<option value='".$device['service_id']."'>".$device['hostname'].' - '.$device['service_type'].'</option>';
+        $service_description = '';
+
+        if (!empty($device['service_desc'])) {
+            $service_description = ' - ' . substr($device['service_desc'], 0, 30);
+        }
+
+        $servicesform .= "<option value='".$device['service_id']."'>".$device['hostname'].' - '.$device['service_type'].$service_description.'</option>';
     }
 
     if ($updated) {
@@ -30,7 +36,7 @@ else {
           <input type=hidden name='delsrv' value='yes'>
           <div class='well well-lg'>
             <div class='form-group'>
-              <label for='service' class='col-sm-2 control-label'>Device - Service</label>
+              <label for='service' class='col-sm-2 control-label'>Device - Service - Description</label>
               <div class='col-sm-5'>
                 <select name='service' id='service' class='form-control input-sm'>
                   $servicesform