diff --git a/api/DataAccess/ServiceMessages/ServiceMessagesGateway.php b/api/DataAccess/ServiceMessages/ServiceMessagesGateway.php
index 371089a9..d9d8985a 100644
--- a/api/DataAccess/ServiceMessages/ServiceMessagesGateway.php
+++ b/api/DataAccess/ServiceMessages/ServiceMessagesGateway.php
@@ -32,7 +32,7 @@ class ServiceMessagesGateway extends CommonDao {
             '{$type}',
             '{$myOrder}',
             '" . hesk_dbEscape($serviceMessage->icon) . "',
-            '" . hesk_dbEscape($serviceMessage->language) . "',
+            '" . hesk_dbEscape($serviceMessage->language) . "'
             )");
 
         $serviceMessage->id = hesk_dbInsertID();
@@ -102,7 +102,7 @@ class ServiceMessagesGateway extends CommonDao {
             SET `title` = '" . hesk_dbEscape($serviceMessage->title) . "', 
                 `message` = '" . hesk_dbEscape($serviceMessage->message) . "', 
                 `style` = '" . intval($style) . "', 
-                `type` = " . intval($type) . ",
+                `type` = '{$type}',
                 `icon` = '" . hesk_dbEscape($serviceMessage->icon) . "',
                 `order` = " . intval($serviceMessage->order) . ",
                 `mfh_language` = '" . hesk_dbEscape($serviceMessage->language) . "'
diff --git a/index.php b/index.php
index e9082980..ad824f67 100644
--- a/index.php
+++ b/index.php
@@ -1315,7 +1315,12 @@ function print_start()
 </ol>
     <?php
     // Service messages
-    $res = hesk_dbQuery('SELECT `title`, `message`, `style`, `icon` FROM `'.hesk_dbEscape($hesk_settings['db_pfix'])."service_messages` WHERE `type`='0' ORDER BY `order` ASC");
+    $res = hesk_dbQuery('SELECT `title`, `message`, `style`, `icon` FROM `'.hesk_dbEscape($hesk_settings['db_pfix'])."service_messages` AS `sm`
+        INNER JOIN `" . hesk_dbEscape($hesk_settings['db_pfix'])  . "mfh_service_message_to_location` AS `location`
+            ON `sm`.`id` = `location`.`service_message_id`
+            AND `location`.`location` = 'CUSTOMER_HOME'
+        WHERE `type`='0' 
+        ORDER BY `order` ASC");
     if (hesk_dbNumRows($res) > 0)
     {
     ?>