diff --git a/includes/html/modal/new_service_template.inc.php b/includes/html/modal/new_service_template.inc.php
index ee8facf6c0..ae96b15200 100644
--- a/includes/html/modal/new_service_template.inc.php
+++ b/includes/html/modal/new_service_template.inc.php
@@ -15,6 +15,9 @@ if (Auth::user()->hasGlobalAdmin()) {
     foreach (dbFetchRows('SELECT * FROM `device_groups` ORDER BY `name`') as $device_group) {
         $devicegroupsform .= "<option value='" . $device_group['id'] . "'>" . $device_group['name'] . '</option>';
     }
+    foreach (list_available_services() as $current_service) {
+        $servicesform .= "<option value='$current_service'>$current_service</option>";
+    }
     // Build the types list.
     $dir = \LibreNMS\Config::get('nagios_plugins');
     if (file_exists($dir) && is_dir($dir)) {
@@ -39,7 +42,6 @@ if (Auth::user()->hasGlobalAdmin()) {
                 <form method="post" role="form" id="service-template" class="form-horizontal service-template-form">
                     <?php echo csrf_field() ?>
                     <input type="hidden" name="service_template_id" id="service_template_id" value="">
-                    <input type="hidden" name="device_group_id" id="device_group_id" value="<?php echo $device_group['id']?>">
                     <input type="hidden" name="type" id="type" value="create-service-template">
                     <div class="form-service-template">
                         <div class="col-sm-12">
@@ -47,20 +49,18 @@ if (Auth::user()->hasGlobalAdmin()) {
                         </div>
                     </div>
                     <div class="form-service-template row">
-                        <label for='device_group' class='col-sm-3 control-label'>Device Group: </label>
+                        <label for='device_group_id' class='col-sm-3 control-label'>Device Group: </label>
                         <div class="col-sm-9">
-                            <select name='device_group' class='form-control input-sm'>
+                            <select name='device_group_id' class='form-control has-feedback'>
                                 $devicegroupsform
                             </select>
                         </div>
-                        <div class='col-sm-5'>
-                        </div>
                     </div>
                     <div class="form-service-template row">
                         <label for='stype' class='col-sm-3 control-label'>Type: </label>
                         <div class="col-sm-9">
                             <select id='stype' name='stype' placeholder='type' class='form-control has-feedback'>
-                                <?php echo $stype?>
+                                $servicesform
                             </select>
                         </div>
                     </div>