diff --git a/application/Calendar/CalendarController.php b/application/Calendar/CalendarController.php
index fae309a24..f15cb4f2c 100644
--- a/application/Calendar/CalendarController.php
+++ b/application/Calendar/CalendarController.php
@@ -70,10 +70,27 @@ class CalendarController extends mfBaseController
                         $email->send();
                     } else if ($r->customer_info_type == 2) {
                         $sms = new SmsNotification();
-                        $body = "Xinon Terminbestätigung:" . PHP_EOL . $r->customer_info_text;
+                        $customerText = trim($r->customer_info_text);
+                        $body = "Xinon Terminbestätigung:" . PHP_EOL . $customerText;
                         $sms->setBody($body);
-                        $sms->setRecipient($r->customer_info_type_text);
-                        $sms->send();
+                        $customerNumber = trim($r->customer_info_type_text);
+                        $customerNumber = str_replace(" ", "", $customerNumber);
+                        $customerNumber = str_replace("(", "", $customerNumber);
+                        $customerNumber = str_replace(")", "", $customerNumber);
+                        $customerNumber = str_replace("-", "", $customerNumber);
+                        $customerNumber = str_replace("/", "", $customerNumber);
+                        $customerNumber = str_replace(".", "", $customerNumber);
+                        $customerNumber = str_replace(",", "", $customerNumber);
+                        $customerNumber = str_replace(";", "", $customerNumber);
+                        $customerNumber = str_replace(":", "", $customerNumber);
+
+                        if (preg_match('/^0/', $customerNumber)) {
+                            $customerNumber = "+43" . substr($customerNumber, 1);
+                        }
+                        $sms->setRecipient($customerNumber);
+                        if (!empty($customerNumber) && !empty($customerText)) {
+                            $sms->send();
+                        }
                     }
                 }
                 die();
@@ -104,10 +121,26 @@ class CalendarController extends mfBaseController
                         $email->send();
                     } else if ($r->customer_info_type == 2) {
                         $sms = new SmsNotification();
-                        $body = "Xinon Terminbestätigung:" . PHP_EOL . $r->customer_info_text;
+                        $customerText = trim($r->customer_info_text);
+                        $body = "Xinon Terminbestätigung:" . PHP_EOL . $customerText;
                         $sms->setBody($body);
-                        $sms->setRecipient($r->customer_info_type_text);
-                        $sms->send();
+                        $customerNumber = trim($r->customer_info_type_text);
+                        $customerNumber = str_replace(" ", "", $customerNumber);
+                        $customerNumber = str_replace("(", "", $customerNumber);
+                        $customerNumber = str_replace(")", "", $customerNumber);
+                        $customerNumber = str_replace("-", "", $customerNumber);
+                        $customerNumber = str_replace("/", "", $customerNumber);
+                        $customerNumber = str_replace(".", "", $customerNumber);
+                        $customerNumber = str_replace(",", "", $customerNumber);
+                        $customerNumber = str_replace(";", "", $customerNumber);
+                        $customerNumber = str_replace(":", "", $customerNumber);
+                        if (preg_match('/^0/', $customerNumber)) {
+                            $customerNumber = "+43" . substr($customerNumber, 1);
+                        }
+                        $sms->setRecipient($customerNumber);
+                        if (!empty($customerNumber) && !empty($customerText)) {
+                            $sms->send();
+                        }
                     }
                 }
                 die();
@@ -327,17 +360,18 @@ class CalendarController extends mfBaseController
         echo trim($json);
         die();
     }
+
     private function getTicket($r)
     {
 
         $project = new XinonProject();
 
-        $data=$project->searchSupportTickets($r->term);
+        $data = $project->searchSupportTickets($r->term);
 
         foreach ($data as $key => $value) {
             $rows[] = array(
                 'id' => $value['id'],
-                'text' => 'Ticket: '.$value['id']." ".$value['subject'],
+                'text' => 'Ticket: ' . $value['id'] . " " . $value['subject'],
                 'subject' => $value['subject'],
                 'mail' => $value['customField5'],
                 'mobilenumber' => $value['customField4'],
diff --git a/public/js/pages/Calendar/View.js b/public/js/pages/Calendar/View.js
index 2d32dc2c7..5df62fe6d 100644
--- a/public/js/pages/Calendar/View.js
+++ b/public/js/pages/Calendar/View.js
@@ -454,8 +454,12 @@ document.addEventListener('DOMContentLoaded', function () {
                                     } else if (obj.customer_info_type == 2) {
                                         typeText = 'SMS';
                                     }
+                                    let customer_info_text = "";
+                                    if (obj.customer_info_text) {
+                                        customer_info_text = obj.customer_info_text.replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1<br />$2');
+                                    }
                                     let title = `<div class="text-center font-weight-500">Letzte gesendete Info (` + typeText + `):</div>
-                                                    <div class="text-left">` + obj.customer_info_text.replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1<br />$2') + `</div>  
+                                                    <div class="text-left">` + customer_info_text + `</div>  
                                                     <div class="text-left"><span class="font-weight-500">gesendet an:</span> ` + obj.customer_info_type_text + `</div>
                                                     <div class="text-left"><span class="font-weight-500">gesendet von:</span> ` + obj.sendby + `</div>
                                                     <div class="text-left"><span class="font-weight-500">gesendet am:</span> ` + germanDateTime + `</div>
@@ -1706,8 +1710,7 @@ $(document).ready(function () {
                     }
                 }
             });
-        }
-        else if ($(this).val() == "5") {
+        } else if ($(this).val() == "5") {
             $('.customer-div').hide();
             $('.ticket-div').show();
             $('#ticket').select2({