diff --git a/ajax.php b/ajax.php
index a60433c4..96382acf 100644
--- a/ajax.php
+++ b/ajax.php
@@ -242,7 +242,7 @@ if (isset($_GET['share_generate_link'])) {
     $sql = mysqli_query($mysqli,"SELECT * FROM companies WHERE company_id = 1");
     $row = mysqli_fetch_array($sql);
     $company_name = sanitizeInput($row['company_name']);
-    $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone']));
+    $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code']));
 
     // Sanitize Config vars from get_settings.php
     $config_ticket_from_name = sanitizeInput($config_ticket_from_name);
@@ -444,10 +444,10 @@ if (isset($_POST['update_kanban_ticket'])) {
                     $config_base_url = sanitizeInput($config_base_url);
 
                     // Get Company Info
-                    $sql = mysqli_query($mysqli, "SELECT company_name, company_phone FROM companies WHERE company_id = 1");
+                    $sql = mysqli_query($mysqli, "SELECT company_name, company_phone, company_phone_country_code FROM companies WHERE company_id = 1");
                     $row = mysqli_fetch_array($sql);
                     $company_name = sanitizeInput($row['company_name']);
-                    $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone']));
+                    $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code']));
 
                     // EMAIL
                     $subject = "Ticket resolved - [$ticket_prefix$ticket_number] - $ticket_subject | (pending closure)";
diff --git a/client/post.php b/client/post.php
index 53c6a6df..ea329e89 100644
--- a/client/post.php
+++ b/client/post.php
@@ -605,6 +605,7 @@ if (isset($_GET['stripe_save_card'])) {
     $sql_settings = mysqli_query($mysqli, "SELECT * FROM companies, settings WHERE companies.company_id = settings.company_id AND companies.company_id = 1");
     $row = mysqli_fetch_array($sql_settings);
     $company_name = sanitizeInput($row['company_name']);
+    $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code']));
     $config_smtp_host = $row['config_smtp_host'];
     $config_smtp_port = intval($row['config_smtp_port']);
     $config_smtp_encryption = $row['config_smtp_encryption'];
diff --git a/post/user/invoice.php b/post/user/invoice.php
index eaa0a2b5..dd6288e0 100644
--- a/post/user/invoice.php
+++ b/post/user/invoice.php
@@ -770,9 +770,9 @@ if (isset($_POST['add_payment'])) {
         $client_name = sanitizeInput($row['client_name']);
         $contact_name = sanitizeInput($row['contact_name']);
         $contact_email = sanitizeInput($row['contact_email']);
-        $contact_phone = sanitizeInput(formatPhoneNumber($row['contact_phone']));
+        $contact_phone = sanitizeInput(formatPhoneNumber($row['contact_phone'], $row['contact_phone_country_code']));
         $contact_extension = preg_replace("/[^0-9]/", '',$row['contact_extension']);
-        $contact_mobile = sanitizeInput(formatPhoneNumber($row['contact_mobile']));
+        $contact_mobile = sanitizeInput(formatPhoneNumber($row['contact_mobile'], $row['contact_mobile_country_code']));
 
         $sql = mysqli_query($mysqli,"SELECT * FROM companies WHERE company_id = 1");
         $row = mysqli_fetch_array($sql);
@@ -783,7 +783,7 @@ if (isset($_POST['add_payment'])) {
         $company_city = sanitizeInput($row['company_city']);
         $company_state = sanitizeInput($row['company_state']);
         $company_zip = sanitizeInput($row['company_zip']);
-        $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone']));
+        $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code']));
         $company_email = sanitizeInput($row['company_email']);
         $company_website = sanitizeInput($row['company_website']);
         $company_logo = sanitizeInput($row['company_logo']);
@@ -912,9 +912,9 @@ if (isset($_GET['add_payment_stripe'])) {
     $client_name = sanitizeInput($row['client_name']);
     $contact_name = sanitizeInput($row['contact_name']);
     $contact_email = sanitizeInput($row['contact_email']);
-    $contact_phone = sanitizeInput(formatPhoneNumber($row['contact_phone']));
+    $contact_phone = sanitizeInput(formatPhoneNumber($row['contact_phone'], $row['contact_phone_country_code']));
     $contact_extension = preg_replace("/[^0-9]/", '',$row['contact_extension']);
-    $contact_mobile = sanitizeInput(formatPhoneNumber($row['contact_mobile']));
+    $contact_mobile = sanitizeInput(formatPhoneNumber($row['contact_mobile'], $row['contact_mobile_country_code']));
 
     // Get ITFlow company details
     $sql = mysqli_query($mysqli,"SELECT * FROM companies WHERE company_id = 1");
@@ -925,7 +925,7 @@ if (isset($_GET['add_payment_stripe'])) {
     $company_city = sanitizeInput($row['company_city']);
     $company_state = sanitizeInput($row['company_state']);
     $company_zip = sanitizeInput($row['company_zip']);
-    $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone']));
+    $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code']));
     $company_email = sanitizeInput($row['company_email']);
     $company_website = sanitizeInput($row['company_website']);
 
@@ -1171,11 +1171,11 @@ if (isset($_POST['add_bulk_payment'])) {
         $contact_name = sanitizeInput($row['contact_name']);
         $contact_email = sanitizeInput($row['contact_email']);
 
-        $sql_company = mysqli_query($mysqli,"SELECT company_name, company_phone FROM companies WHERE company_id = 1");
+        $sql_company = mysqli_query($mysqli,"SELECT company_name, company_phone, company_phone_country_code FROM companies WHERE company_id = 1");
         $row = mysqli_fetch_array($sql_company);
 
         $company_name = sanitizeInput($row['company_name']);
-        $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone']));
+        $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code']));
 
         // Sanitize Config vars from get_settings.php
         $config_invoice_from_name = sanitizeInput($config_invoice_from_name);
@@ -1292,7 +1292,7 @@ if (isset($_GET['email_invoice'])) {
     $company_city = sanitizeInput($row['company_city']);
     $company_state = sanitizeInput($row['company_state']);
     $company_zip = sanitizeInput($row['company_zip']);
-    $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone']));
+    $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code']));
     $company_email = sanitizeInput($row['company_email']);
     $company_website = sanitizeInput($row['company_website']);
     $company_logo = sanitizeInput($row['company_logo']);
@@ -1533,14 +1533,14 @@ if (isset($_GET['force_recurring'])) {
         $client_name = sanitizeInput($row['client_name']);
         $contact_name = sanitizeInput($row['contact_name']);
         $contact_email = sanitizeInput($row['contact_email']);
-        $contact_phone = sanitizeInput(formatPhoneNumber($row['contact_phone']));
+        $contact_phone = sanitizeInput(formatPhoneNumber($row['contact_phone'], $row['contact_phone_country_code']));
         $contact_extension = intval($row['contact_extension']);
-        $contact_mobile = sanitizeInput(formatPhoneNumber($row['contact_mobile']));
+        $contact_mobile = sanitizeInput(formatPhoneNumber($row['contact_mobile'], $row['contact_mobile_country_code']));
 
         $sql = mysqli_query($mysqli,"SELECT * FROM companies WHERE company_id = 1");
         $row = mysqli_fetch_array($sql);
         $company_name = sanitizeInput($row['company_name']);
-        $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone']));
+        $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code']));
         $company_email = sanitizeInput($row['company_email']);
         $company_website = sanitizeInput($row['company_website']);
 
diff --git a/post/user/quote.php b/post/user/quote.php
index 8455a270..5c6ee1b0 100644
--- a/post/user/quote.php
+++ b/post/user/quote.php
@@ -478,7 +478,7 @@ if (isset($_GET['email_quote'])) {
     $company_city = sanitizeInput($row['company_city']);
     $company_state = sanitizeInput($row['company_state']);
     $company_zip = sanitizeInput($row['company_zip']);
-    $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone']));
+    $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code']));
     $company_email = sanitizeInput($row['company_email']);
     $company_website = sanitizeInput($row['company_website']);
     $company_logo = sanitizeInput($row['company_logo']);
diff --git a/post/user/ticket.php b/post/user/ticket.php
index f816f282..ced82309 100644
--- a/post/user/ticket.php
+++ b/post/user/ticket.php
@@ -114,10 +114,10 @@ if (isset($_POST['add_ticket'])) {
         $ticket_assigned_to = intval($row['ticket_assigned_to']);
 
         // Get Company Phone Number
-        $sql = mysqli_query($mysqli, "SELECT company_name, company_phone FROM companies WHERE company_id = 1");
+        $sql = mysqli_query($mysqli, "SELECT company_name, company_phone, company_phone_country_code FROM companies WHERE company_id = 1");
         $row = mysqli_fetch_array($sql);
         $company_name = sanitizeInput($row['company_name']);
-        $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone']));
+        $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code']));
 
 
         // EMAILING
@@ -229,10 +229,10 @@ if (isset($_POST['edit_ticket'])) {
     if ($notify && !empty($config_smtp_host)) {
 
         // Get Company Name Phone Number and Sanitize for Email Sending
-        $sql = mysqli_query($mysqli, "SELECT company_name, company_phone FROM companies WHERE company_id = 1");
+        $sql = mysqli_query($mysqli, "SELECT company_name, company_phone, company_phone_country_code FROM companies WHERE company_id = 1");
         $row = mysqli_fetch_array($sql);
         $company_name = sanitizeInput($row['company_name']);
-        $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone']));
+        $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code']));
 
         // Email content
         $data = []; // Queue array
@@ -348,10 +348,10 @@ if (isset($_POST['edit_ticket_contact'])) {
     if ($notify && filter_var($contact_email, FILTER_VALIDATE_EMAIL) && !empty($config_smtp_host)) {
 
         // Get Company Phone Number
-        $sql = mysqli_query($mysqli, "SELECT company_name, company_phone FROM companies WHERE company_id = 1");
+        $sql = mysqli_query($mysqli, "SELECT company_name, company_phone, company_phone_country_code FROM companies WHERE company_id = 1");
         $row = mysqli_fetch_array($sql);
         $company_name = sanitizeInput($row['company_name']);
-        $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone']));
+        $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code']));
 
         $config_ticket_from_email = sanitizeInput($config_ticket_from_email);
         $config_ticket_from_name = sanitizeInput($config_ticket_from_name);
@@ -425,10 +425,10 @@ if (isset($_POST['add_ticket_watcher'])) {
         $ticket_assigned_to = intval($row['ticket_assigned_to']);
 
         // Get Company Phone Number
-        $sql = mysqli_query($mysqli, "SELECT company_name, company_phone FROM companies WHERE company_id = 1");
+        $sql = mysqli_query($mysqli, "SELECT company_name, company_phone, company_phone_country_code FROM companies WHERE company_id = 1");
         $row = mysqli_fetch_array($sql);
         $company_name = sanitizeInput($row['company_name']);
-        $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone']));
+        $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code']));
 
         // Email content
         $data = []; // Queue array
@@ -1018,10 +1018,10 @@ if (isset($_POST['bulk_resolve_tickets'])) {
                 $base_url = sanitizeInput($config_base_url);
 
                 // Get Company Info
-                $sql = mysqli_query($mysqli, "SELECT company_name, company_phone FROM companies WHERE company_id = 1");
+                $sql = mysqli_query($mysqli, "SELECT company_name, company_phone, company_phone_country_code FROM companies WHERE company_id = 1");
                 $row = mysqli_fetch_array($sql);
                 $company_name = sanitizeInput($row['company_name']);
-                $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone']));
+                $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code']));
 
 
                 // EMAIL
@@ -1157,10 +1157,10 @@ if (isset($_POST['bulk_ticket_reply'])) {
             $from_email = sanitizeInput($config_ticket_from_email);
             $base_url = sanitizeInput($config_base_url);
 
-            $sql = mysqli_query($mysqli, "SELECT company_name, company_phone FROM companies WHERE company_id = 1");
+            $sql = mysqli_query($mysqli, "SELECT company_name, company_phone, company_phone_country_code FROM companies WHERE company_id = 1");
             $row = mysqli_fetch_array($sql);
             $company_name = sanitizeInput($row['company_name']);
-            $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone']));
+            $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code']));
 
             // Send e-mail to client if public update & email is set up
             if ($private_note == 0 && !empty($config_smtp_host)) {
@@ -1465,10 +1465,10 @@ if (isset($_POST['add_ticket_reply'])) {
         $config_ticket_from_email = sanitizeInput($config_ticket_from_email);
         $config_base_url = sanitizeInput($config_base_url);
 
-        $sql = mysqli_query($mysqli, "SELECT company_name, company_phone FROM companies WHERE company_id = 1");
+        $sql = mysqli_query($mysqli, "SELECT company_name, company_phone, company_phone_country_code FROM companies WHERE company_id = 1");
         $row = mysqli_fetch_array($sql);
         $company_name = sanitizeInput($row['company_name']);
-        $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone']));
+        $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code']));
 
         // Send e-mail to client if public update & email is set up
         if ($ticket_reply_type == 'Public' && $send_email == 1 && !empty($config_smtp_host)) {
@@ -1722,10 +1722,10 @@ if (isset($_GET['resolve_ticket'])) {
         $config_base_url = sanitizeInput($config_base_url);
 
         // Get Company Info
-        $sql = mysqli_query($mysqli, "SELECT company_name, company_phone FROM companies WHERE company_id = 1");
+        $sql = mysqli_query($mysqli, "SELECT company_name, company_phone, company_phone_country_code FROM companies WHERE company_id = 1");
         $row = mysqli_fetch_array($sql);
         $company_name = sanitizeInput($row['company_name']);
-        $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone']));
+        $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code']));
 
         // EMAIL
         $subject = "Ticket resolved - [$ticket_prefix$ticket_number] - $ticket_subject | (pending closure)";
@@ -1815,10 +1815,10 @@ if (isset($_GET['close_ticket'])) {
         $config_base_url = sanitizeInput($config_base_url);
 
         // Get Company Info
-        $sql = mysqli_query($mysqli, "SELECT company_name, company_phone FROM companies WHERE company_id = 1");
+        $sql = mysqli_query($mysqli, "SELECT company_name, company_phone, company_phone_country_code FROM companies WHERE company_id = 1");
         $row = mysqli_fetch_array($sql);
         $company_name = sanitizeInput($row['company_name']);
-        $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone']));
+        $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code']));
 
         // EMAIL
         $subject = "Ticket closed - [$ticket_prefix$ticket_number] - $ticket_subject | (do not reply)";
diff --git a/scripts/cron.php b/scripts/cron.php
index d772de65..9a9f47e7 100644
--- a/scripts/cron.php
+++ b/scripts/cron.php
@@ -20,7 +20,7 @@ $row = mysqli_fetch_array($sql_companies);
 
 // Company Details
 $company_name = sanitizeInput($row['company_name']);
-$company_phone = sanitizeInput(formatPhoneNumber($row['company_phone']));
+$company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code']));
 $company_email = sanitizeInput($row['company_email']);
 $company_website = sanitizeInput($row['company_website']);
 $company_city = sanitizeInput($row['company_city']);
diff --git a/scripts/cron_ticket_email_parser.php b/scripts/cron_ticket_email_parser.php
index f0569f2b..d558549c 100644
--- a/scripts/cron_ticket_email_parser.php
+++ b/scripts/cron_ticket_email_parser.php
@@ -33,7 +33,7 @@ $config_ticket_email_parse_unknown_senders = intval($row['config_ticket_email_pa
 $sql = mysqli_query($mysqli, "SELECT * FROM companies, settings WHERE companies.company_id = settings.company_id AND companies.company_id = 1");
 $row = mysqli_fetch_array($sql);
 $company_name = sanitizeInput($row['company_name']);
-$company_phone = sanitizeInput(formatPhoneNumber($row['company_phone']));
+$company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code']));
 
 // Check setting enabled
 if ($config_ticket_email_parse == 0) {