diff --git a/invoice.php b/invoice.php
index 38f5ec1f..747aa444 100644
--- a/invoice.php
+++ b/invoice.php
@@ -37,6 +37,11 @@ if(isset($_GET['invoice_id'])){
   if(strlen($client_phone)>2){ 
     $client_phone = substr($row['client_phone'],0,3)."-".substr($row['client_phone'],3,3)."-".substr($row['client_phone'],6,4);
   }
+  $client_extension = $row['client_extension'];
+  $client_mobile = $row['client_mobile'];
+  if(strlen($client_mobile)>2){ 
+    $client_mobile = substr($row['client_mobile'],0,3)."-".substr($row['client_mobile'],3,3)."-".substr($row['client_mobile'],6,4);
+  }
   $client_website = $row['client_website'];
   $client_net_terms = $row['client_net_terms'];
   if($client_net_terms == 0){
@@ -165,7 +170,7 @@ if(isset($_GET['invoice_id'])){
           <li><h4><strong><?php echo $config_company_name; ?></strong></h4></li>
           <li><?php echo $config_company_address; ?></li>
           <li><?php echo "$config_company_city $config_company_state $config_company_zip"; ?></li>
-          <li>P: <?php echo $config_company_phone; ?></li>
+          <li><?php echo $config_company_phone; ?></li>
           <li><?php echo $config_company_email; ?></li>
         </ul>
       </div>
@@ -174,8 +179,9 @@ if(isset($_GET['invoice_id'])){
           <li><h4><strong><?php echo $client_name; ?></strong></h4></li>
           <li><?php echo $client_address; ?></li>
           <li><?php echo "$client_city $client_state $client_zip"; ?></li>
-          <li>P: <?php echo $client_phone; ?></li>
-          <li>E: <?php echo $client_email; ?></li>
+          <li><?php echo "$client_phone $client_extension"; ?></li>
+          <li><?php echo $client_mobile; ?></li>
+          <li><?php echo $client_email; ?></li>
         </ul>
       </div>
     </div>
diff --git a/post.php b/post.php
index 33a35133..88266fb9 100644
--- a/post.php
+++ b/post.php
@@ -1842,7 +1842,12 @@ if(isset($_GET['pdf_quote'])){
     $client_email = $row['client_email'];
     $client_phone = $row['client_phone'];
     if(strlen($client_phone)>2){ 
-    $client_phone = substr($row['client_phone'],0,3)."-".substr($row['client_phone'],3,3)."-".substr($row['client_phone'],6,4);
+      $client_phone = substr($row['client_phone'],0,3)."-".substr($row['client_phone'],3,3)."-".substr($row['client_phone'],6,4);
+    }
+    $client_extension = $row['client_extension'];
+    $client_mobile = $row['client_mobile'];
+    if(strlen($client_mobile)>2){ 
+      $client_mobile = substr($row['client_mobile'],0,3)."-".substr($row['client_mobile'],3,3)."-".substr($row['client_mobile'],6,4);
     }
     $client_website = $row['client_website'];
 
diff --git a/quote.php b/quote.php
index 9cca81f3..209b2a5e 100644
--- a/quote.php
+++ b/quote.php
@@ -31,6 +31,11 @@ if(isset($_GET['quote_id'])){
   if(strlen($client_phone)>2){ 
     $client_phone = substr($row['client_phone'],0,3)."-".substr($row['client_phone'],3,3)."-".substr($row['client_phone'],6,4);
   }
+  $client_extension = $row['client_extension'];
+  $client_mobile = $row['client_mobile'];
+  if(strlen($client_mobile)>2){ 
+    $client_mobile = substr($row['client_mobile'],0,3)."-".substr($row['client_mobile'],3,3)."-".substr($row['client_mobile'],6,4);
+  }
   $client_website = $row['client_website'];
   $client_net_terms = $row['client_net_terms'];
   if($client_net_terms == 0){
@@ -135,7 +140,7 @@ if(isset($_GET['quote_id'])){
           <li><h4><strong><?php echo $config_company_name; ?></strong></h4></li>
           <li><?php echo $config_company_address; ?></li>
           <li><?php echo "$config_company_city $config_company_state $config_company_zip"; ?></li>
-          <li>P: <?php echo $config_company_phone; ?></li>
+          <li><?php echo $config_company_phone; ?></li>
           <li><?php echo $config_company_email; ?></li>
         </ul>
       </div>
@@ -144,8 +149,9 @@ if(isset($_GET['quote_id'])){
           <li><h4><strong><?php echo $client_name; ?></strong></h4></li>
           <li><?php echo $client_address; ?></li>
           <li><?php echo "$client_city $client_state $client_zip"; ?></li>
-          <li>P: <?php echo $client_phone; ?></li>
-          <li>E: <?php echo $client_email; ?></li>
+          <li><?php echo "$client_phone $client_extension"; ?></li>
+          <li><?php echo "$client_mobile"; ?></li>
+          <li><?php echo $client_email; ?></li>
         </ul>
       </div>
     </div>
diff --git a/recurring_invoice.php b/recurring_invoice.php
index 37cbe272..e1f555ee 100644
--- a/recurring_invoice.php
+++ b/recurring_invoice.php
@@ -35,6 +35,11 @@ if(isset($_GET['recurring_id'])){
   if(strlen($client_phone)>2){ 
     $client_phone = substr($row['client_phone'],0,3)."-".substr($row['client_phone'],3,3)."-".substr($row['client_phone'],6,4);
   }
+  $client_extension = $row['client_extension'];
+  $client_mobile = $row['client_mobile'];
+  if(strlen($client_mobile)>2){ 
+    $client_mobile = substr($row['client_mobile'],0,3)."-".substr($row['client_mobile'],3,3)."-".substr($row['client_mobile'],6,4);
+  }
   $client_website = $row['client_website'];
   $client_net_terms = $row['client_net_terms'];
   
@@ -105,7 +110,7 @@ if(isset($_GET['recurring_id'])){
           <li><h4><strong><?php echo $config_company_name; ?></strong></h4></li>
           <li><?php echo $config_company_address; ?></li>
           <li><?php echo "$config_company_city $config_company_state $config_company_zip"; ?></li>
-          <li>P: <?php echo $config_company_phone; ?></li>
+          <li><?php echo $config_company_phone; ?></li>
           <li><?php echo $config_company_email; ?></li>
         </ul>
       </div>
@@ -114,8 +119,9 @@ if(isset($_GET['recurring_id'])){
           <li><h4><strong><?php echo $client_name; ?></strong></h4></li>
           <li><?php echo $client_address; ?></li>
           <li><?php echo "$client_city $client_state $client_zip"; ?></li>
-          <li>P: <?php echo $client_phone; ?></li>
-          <li>E: <?php echo $client_email; ?></li>
+          <li><?php echo "$client_phone $client_extension"; ?></li>
+          <li><?php echo $client_mobile; ?></li>
+          <li><?php echo $client_email; ?></li>
         </ul>
       </div>
     </div>