diff --git a/html/includes/forms/create-service.inc.php b/html/includes/forms/create-service.inc.php
index 3a7ad14d6c..8223de2cf4 100644
--- a/html/includes/forms/create-service.inc.php
+++ b/html/includes/forms/create-service.inc.php
@@ -17,11 +17,11 @@ if (is_admin() === false) {
 }
 
 $service_id = $vars['service_id'];
-$type = mres($vars['stype']);
-$desc = mres($vars['desc']);
-$ip = mres($vars['ip']);
-$param = mres($vars['param']);
-$device_id = mres($vars['device_id']);
+$type = $vars['stype'];
+$desc = $vars['desc'];
+$ip = $vars['ip'];
+$param = $vars['param'];
+$device_id = $vars['device_id'];
 
 if (is_numeric($service_id) && $service_id > 0) {
     // Need to edit.
diff --git a/html/includes/modal/new_service.inc.php b/html/includes/modal/new_service.inc.php
index ecba0b7628..dba2f6caa1 100644
--- a/html/includes/modal/new_service.inc.php
+++ b/html/includes/modal/new_service.inc.php
@@ -55,7 +55,7 @@ if (is_admin() !== false) {
                     <div class='form-service'>
                         <label for='desc' class='col-sm-3 control-label'>Description: </label>
                         <div class='col-sm-9'>
-                            <input type='text' id='desc' name='desc' class='form-control'/>
+                            <textarea id='desc' name='desc' class='form-control'></textarea>
                         </div>
                     </div>
                     <div class="form-service">
diff --git a/html/includes/vars.inc.php b/html/includes/vars.inc.php
index 90b05680c1..9bf3c36ea4 100644
--- a/html/includes/vars.inc.php
+++ b/html/includes/vars.inc.php
@@ -38,5 +38,5 @@ foreach ($_GET as $name => $value) {
 }
 
 foreach ($_POST as $name => $value) {
-    $vars[$name] = clean($value);
+    $vars[$name] = ($value);
 }
diff --git a/html/pages/services.inc.php b/html/pages/services.inc.php
index 1f614b5e68..bd20b82fea 100644
--- a/html/pages/services.inc.php
+++ b/html/pages/services.inc.php
@@ -131,8 +131,8 @@ foreach (dbFetchRows($host_sql, $host_par) as $device) {
         <td><?php echo $devlink?></td>
         <td><?php echo $status?></td>
         <td><?php echo formatUptime(time() - $service['service_changed'])?></td>
-        <td><span class='box-desc'><?php echo nl2br(trim($service['service_message']))?></span></td>
-        <td><span class='box-desc'><?php echo nl2br(trim($service['service_desc']))?></span></td>
+        <td><span class='box-desc'><?php echo nl2br(display($service['service_message']))?></span></td>
+        <td><span class='box-desc'><?php echo nl2br(display($service['service_desc']))?></span></td>
         <td>
             <button type='button' class='btn btn-primary btn-sm' aria-label='Edit' data-toggle='modal' data-target='#create-service' data-service_id='<?php echo $service['service_id']?>' name='edit-service'><i class='fa fa-pencil' aria-hidden='true'></i></button>
             <button type='button' class='btn btn-danger btn-sm' aria-label='Delete' data-toggle='modal' data-target='#confirm-delete' data-service_id='<?php echo $service['service_id']?>' name='delete-service'><i class='fa fa-trash' aria-hidden='true'></i></button>