diff --git a/calendar_events.php b/calendar_events.php
index 0db3baf1..5d8fb791 100644
--- a/calendar_events.php
+++ b/calendar_events.php
@@ -128,7 +128,7 @@ while($row = mysqli_fetch_array($sql)){
 
           <?php
           //Vendors Added Created
-          $sql = mysqli_query($mysqli,"SELECT * FROM clients LEFT JOIN vendors ON client_id = vendor_client_id WHERE clients.company_id = $session_company_id");
+          $sql = mysqli_query($mysqli,"SELECT * FROM clients LEFT JOIN vendors ON client_id = vendor_client_id WHERE vendor_template = 0 AND clients.company_id = $session_company_id");
           while($row = mysqli_fetch_array($sql)){
             $event_id = json_encode($row['vendor_id']);
             $event_title = json_encode($row['vendor_name']);
diff --git a/client_asset_add_modal.php b/client_asset_add_modal.php
index 457841b6..51cb2119 100644
--- a/client_asset_add_modal.php
+++ b/client_asset_add_modal.php
@@ -237,7 +237,7 @@
                     <option value="">- Vendor -</option>
                     <?php 
                     
-                    $sql = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_archived_at IS NULL AND vendor_client_id = $client_id ORDER BY vendor_name ASC"); 
+                    $sql = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_archived_at IS NULL AND vendor_client_id = $client_id AND vendor_template = 0 ORDER BY vendor_name ASC"); 
                     while($row = mysqli_fetch_array($sql)){
                       $vendor_id = $row['vendor_id'];
                       $vendor_name = htmlentities($row['vendor_name']);
diff --git a/client_asset_copy_modal.php b/client_asset_copy_modal.php
index 6f4a463c..d7da3597 100644
--- a/client_asset_copy_modal.php
+++ b/client_asset_copy_modal.php
@@ -234,7 +234,7 @@
                     <option value="">- Vendor -</option>
                     <?php 
                     
-                    $sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE (vendor_archived_at > '$asset_created_at' OR vendor_archived_at IS NULL) AND vendor_client_id = $client_id ORDER BY vendor_name ASC"); 
+                    $sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE (vendor_archived_at > '$asset_created_at' OR vendor_archived_at IS NULL) AND vendor_client_id = $client_id  AND vendor_template = 0 ORDER BY vendor_name ASC"); 
                     while($row = mysqli_fetch_array($sql_vendors)){
                       $vendor_id_select = $row['vendor_id'];
                       $vendor_name_select = htmlentities($row['vendor_name']);
diff --git a/client_overview.php b/client_overview.php
index 33bfa20b..fce0d2f1 100644
--- a/client_overview.php
+++ b/client_overview.php
@@ -6,7 +6,7 @@ $sql_contacts = mysqli_query($mysqli,"SELECT * FROM contacts WHERE contact_clien
 
 $sql_important_contacts = mysqli_query($mysqli,"SELECT * FROM contacts WHERE contact_client_id = $client_id AND contact_important = 1 AND contact_archived_at IS NULL AND contacts.company_id = $session_company_id ORDER BY contact_updated_at, contact_name DESC");
 
-$sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_client_id = $client_id AND vendor_archived_at IS NULL AND company_id = $session_company_id ORDER BY vendor_updated_at DESC LIMIT 5");
+$sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_client_id = $client_id AND vendor_template = 0 AND vendor_archived_at IS NULL AND company_id = $session_company_id ORDER BY vendor_updated_at DESC LIMIT 5");
 
 $sql_documents = mysqli_query($mysqli, "SELECT * FROM documents WHERE document_client_id = $client_id AND document_archived_at IS NULL AND documents.company_id = $session_company_id ORDER BY document_updated_at DESC LIMIT 5");
 
diff --git a/client_service_add_modal.php b/client_service_add_modal.php
index 858ebe5d..b28bb9ee 100644
--- a/client_service_add_modal.php
+++ b/client_service_add_modal.php
@@ -113,7 +113,7 @@
                 <label for="vendors">Select related vendors</label>
                 <select multiple class="form-control" id="vendors" name="vendors[]">
                   <?php
-                  $sql = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_client_id = '$client_id'");
+                  $sql = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_template = 0 AND vendor_client_id = '$client_id'");
                   while($row = mysqli_fetch_array($sql)){
                     $vendor_id = $row['vendor_id'];
                     $vendor_name = htmlentities($row['vendor_name']);
diff --git a/client_service_edit_modal.php b/client_service_edit_modal.php
index 6829bb2b..d7313c0d 100644
--- a/client_service_edit_modal.php
+++ b/client_service_edit_modal.php
@@ -128,7 +128,7 @@
                   <?php
                   $selected_ids = array_column(mysqli_fetch_all($sql_vendors,MYSQLI_ASSOC), "vendor_id");
 
-                  $sql_all = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_client_id = '$client_id'");
+                  $sql_all = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_template = 0 AND vendor_client_id = '$client_id'");
                   while($row_all = mysqli_fetch_array($sql_all)){
                     $vendor_id = $row_all['vendor_id'];
                     $vendor_name = htmlentities($row_all['vendor_name']);
diff --git a/client_vendor_templates.php b/client_vendor_templates.php
new file mode 100644
index 00000000..c3ba6452
--- /dev/null
+++ b/client_vendor_templates.php
@@ -0,0 +1,179 @@
+<?php include("inc_all_client.php"); ?>
+
+<?php
+
+if(isset($_GET['q'])){
+  $q = strip_tags(mysqli_real_escape_string($mysqli,$_GET['q']));
+  //Phone Numbers
+  $phone_query = preg_replace("/[^0-9]/", '',$q);
+  if(empty($phone_query)){
+    $phone_query = $q;
+  }
+}else{
+  $q = "";
+  $phone_query = "";
+}
+
+if(!empty($_GET['sb'])){
+  $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
+}else{
+  $sb = "vendor_name";
+}
+
+//Rebuild URL
+$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+
+$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM vendors 
+  WHERE vendor_template = 1 
+  AND (vendor_name LIKE '%$q%' OR vendor_description LIKE '%$q%' OR vendor_account_number LIKE '%$q%' OR vendor_website LIKE '%$q%' OR vendor_contact_name LIKE '%$q%' OR vendor_email LIKE '%$q%' OR vendor_phone LIKE '%$phone_query%') ORDER BY $sb $o LIMIT $record_from, $record_to");
+
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+
+?>
+
+<div class="card card-dark">
+  <div class="card-header py-2">
+    <h3 class="card-title mt-2">
+      <i class="fa fa-fw fa-building"></i> Vendor Templates
+    </h3>
+    <button type="button" class="btn btn-dark dropdown-toggle ml-1" data-toggle="dropdown"></button>
+    <div class="dropdown-menu">
+      <a class="dropdown-item text-dark" href="client_vendors.php?client_id=<?php echo $client_id; ?>">Vendors</a>
+    </div>
+    <div class="card-tools">
+        <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addVendorTemplateModal">
+          <i class="fas fa-fw fa-plus"></i> New Template
+        </button>
+    </div>
+  </div>
+  <div class="card-body">
+    <form autocomplete="off">
+      <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+      <div class="row">
+        
+        <div class="col-md-4">
+          <div class="input-group mb-3 mb-md-0">
+            <input type="search" class="form-control" name="q" value="<?php if(isset($q)){ echo strip_tags(htmlentities($q)); } ?>" placeholder="Search Vendors Templates">
+            <div class="input-group-append">
+              <button class="btn btn-dark"><i class="fa fa-search"></i></button>
+            </div>
+          </div>
+        </div>
+
+      </div>
+    </form>
+    <hr>
+    <div class="table-responsive">
+      <table class="table table-striped table-borderless table-hover">
+        <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
+          <tr>
+            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=vendor_name&o=<?php echo $disp; ?>">Vendor</a></th>
+            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=vendor_description&o=<?php echo $disp; ?>">Description</a></th>
+            <th>Contact</th>
+            <th class="text-center">Action</th>
+          </tr>
+        </thead>
+        <tbody>
+          <?php
+      
+          while($row = mysqli_fetch_array($sql)){
+            $vendor_id = $row['vendor_id'];
+            $vendor_name = htmlentities($row['vendor_name']);
+            $vendor_description = htmlentities($row['vendor_description']);
+            if(empty($vendor_description)){
+              $vendor_description_display = "-";
+            }else{
+              $vendor_description_display = $vendor_description;
+            }
+            $vendor_account_number = htmlentities($row['vendor_account_number']);
+            $vendor_contact_name = htmlentities($row['vendor_contact_name']);
+            if(empty($vendor_contact_name)){
+              $vendor_contact_name_display = "-";
+            }else{
+              $vendor_contact_name_display = $vendor_contact_name;
+            }
+            $vendor_phone = formatPhoneNumber($row['vendor_phone']);
+            $vendor_extension = htmlentities($row['vendor_extension']);
+            $vendor_email = htmlentities($row['vendor_email']);
+            $vendor_website = htmlentities($row['vendor_website']);
+            $vendor_hours = htmlentities($row['vendor_hours']);
+            $vendor_sla = htmlentities($row['vendor_sla']);
+            $vendor_code = htmlentities($row['vendor_code']);
+            $vendor_notes = htmlentities($row['vendor_notes']);
+              
+          ?>
+          <tr>
+            <th>
+              <i class="fa fa-fw fa-building text-secondary"></i> 
+              <a class="text-dark" href="#" data-toggle="modal" data-target="#editVendorTemplateModal<?php echo $vendor_id; ?>"><?php echo $vendor_name; ?></a>
+              <?php
+              if(!empty($vendor_account_number)){
+              ?>
+              <br>
+              <small class="text-secondary"><?php echo $vendor_account_number; ?></small>
+              <?php
+              }
+              ?>
+            </th>
+            <td><?php echo $vendor_description_display; ?></td>
+            <td>
+              <?php
+              if(!empty($vendor_contact_name)){
+              ?>
+              <i class="fa fa-fw fa-user text-secondary mr-2 mb-2"></i><?php echo $vendor_contact_name_display; ?>
+              <br>
+              <?php
+              }else{
+                echo $vendor_contact_name_display;
+              }
+              ?>
+              <?php
+              if(!empty($vendor_phone)){
+              ?>
+              <i class="fa fa-fw fa-phone text-secondary mr-2 mb-2"></i><?php echo $vendor_phone; ?>
+              <br>
+              <?php
+              }
+              ?>
+              <?php
+              if(!empty($vendor_email)){
+              ?>
+              <i class="fa fa-fw fa-envelope text-secondary mr-2 mb-2"></i><?php echo $vendor_email; ?>
+              <br>
+              <?php
+              }
+              ?>
+            </td>
+            <td>
+              <div class="dropdown dropleft text-center">
+                <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
+                  <i class="fas fa-ellipsis-h"></i>
+                </button>
+                <div class="dropdown-menu">
+                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editVendorTemplateModal<?php echo $vendor_id; ?>">Edit</a>
+                  <?php if($session_user_role == 3) { ?>
+                    <div class="dropdown-divider"></div>
+                    <a class="dropdown-item text-danger" href="post.php?delete_vendor=<?php echo $vendor_id; ?>">Delete</a>
+                  <?php } ?>
+                </div>
+              </div>
+            </td>
+          </tr>
+
+          <?php
+          
+          include("vendor_template_edit_modal.php");
+          }
+          
+          ?>
+
+        </tbody>
+      </table>
+    </div>
+    <?php include("pagination.php"); ?>
+  </div>
+</div>
+
+<?php include("vendor_template_add_modal.php"); ?>
+
+<?php include("footer.php"); ?>
\ No newline at end of file
diff --git a/client_vendors.php b/client_vendors.php
index 2d83d9ed..3d5461bf 100644
--- a/client_vendors.php
+++ b/client_vendors.php
@@ -24,7 +24,8 @@ if(!empty($_GET['sb'])){
 $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
 
 $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM vendors 
-  WHERE vendor_client_id = $client_id 
+  WHERE vendor_client_id = $client_id
+  AND vendor_template = 0
   AND (vendor_name LIKE '%$q%' OR vendor_description LIKE '%$q%' OR vendor_account_number LIKE '%$q%' OR vendor_website LIKE '%$q%' OR vendor_contact_name LIKE '%$q%' OR vendor_email LIKE '%$q%' OR vendor_phone LIKE '%$phone_query%') ORDER BY $sb $o LIMIT $record_from, $record_to");
 
 $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
@@ -47,9 +48,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
         </button>
         <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
         <div class="dropdown-menu">
-          <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#contactInviteModal">From Template</a>
-          <div class="dropdown-divider"></div>
-          <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#contactInviteModal">Template</a>
+          <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addVendorFromTemplateModal">From Template</a>
         </div>
       </div>
     </div>
@@ -191,5 +190,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 </div>
 
 <?php include("vendor_add_modal.php"); ?>
+<?php include("vendor_add_from_template_modal.php"); ?>
 
 <?php include("footer.php"); ?>
\ No newline at end of file
diff --git a/dashboard_financial.php b/dashboard_financial.php
index 142d12f2..ac9ae6f9 100644
--- a/dashboard_financial.php
+++ b/dashboard_financial.php
@@ -105,7 +105,7 @@ $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('client_id') AS cli
 $clients_added = $row['clients_added'];
 
 //Get Total Vendors added
-$row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('vendor_id') AS vendors_added FROM vendors WHERE YEAR(vendor_created_at) = $year AND vendor_client_id = 0 AND company_id = $session_company_id"));
+$row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('vendor_id') AS vendors_added FROM vendors WHERE YEAR(vendor_created_at) = $year AND vendor_client_id = 0 AND vendor_template = 0 AND company_id = $session_company_id"));
 $vendors_added = $row['vendors_added'];
 
 ?>
diff --git a/expense_add_modal.php b/expense_add_modal.php
index 438ac60a..2d935f95 100644
--- a/expense_add_modal.php
+++ b/expense_add_modal.php
@@ -83,7 +83,7 @@
                   <option value="">- Vendor -</option>
                   <?php 
                   
-                  $sql = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_client_id = 0 AND vendor_archived_at IS NULL AND company_id = $session_company_id ORDER BY vendor_name ASC"); 
+                  $sql = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_client_id = 0 AND vendor_template = 0 AND vendor_archived_at IS NULL AND company_id = $session_company_id ORDER BY vendor_name ASC"); 
                   while($row = mysqli_fetch_array($sql)){
                     $vendor_id = $row['vendor_id'];
                     $vendor_name = htmlentities($row['vendor_name']);
diff --git a/expense_copy_modal.php b/expense_copy_modal.php
index 9aaa7b5d..35b38c86 100644
--- a/expense_copy_modal.php
+++ b/expense_copy_modal.php
@@ -82,7 +82,7 @@
                 <select class="form-control select2" name="vendor" required>
                   <?php 
                   
-                  $sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE company_id = $session_company_id ORDER BY vendor_name ASC"); 
+                  $sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_client_id = 0 AND vendor_template = 0 AND company_id = $session_company_id ORDER BY vendor_name ASC"); 
                   while($row = mysqli_fetch_array($sql_vendors)){
                     $vendor_id_select = $row['vendor_id'];
                     $vendor_name_select = htmlentities($row['vendor_name']);
diff --git a/expense_edit_modal.php b/expense_edit_modal.php
index f581464f..289a698e 100644
--- a/expense_edit_modal.php
+++ b/expense_edit_modal.php
@@ -85,7 +85,7 @@
                 <select class="form-control select2" name="vendor" required>
                   <?php 
                   
-                  $sql_select = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_client_id = 0 AND (vendor_archived_at > '$expense_created_at' OR vendor_archived_at IS NULL) AND company_id = $session_company_id ORDER BY vendor_name ASC"); 
+                  $sql_select = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_client_id = 0 AND vendor_template = 0 AND (vendor_archived_at > '$expense_created_at' OR vendor_archived_at IS NULL) AND company_id = $session_company_id ORDER BY vendor_name ASC"); 
                   while($row = mysqli_fetch_array($sql_select)){
                     $vendor_id_select = $row['vendor_id'];
                     $vendor_name_select = htmlentities($row['vendor_name']);
diff --git a/inc_all_client.php b/inc_all_client.php
index 17b04c00..02a5c046 100644
--- a/inc_all_client.php
+++ b/inc_all_client.php
@@ -123,7 +123,7 @@ if(isset($_GET['client_id'])){
     $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('service_id') AS num FROM services WHERE service_client_id = $client_id"));
     $num_services = $row['num'];
     
-    $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('vendor_id') AS num FROM vendors WHERE vendor_archived_at IS NULL AND vendor_client_id = $client_id"));
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('vendor_id') AS num FROM vendors WHERE vendor_archived_at IS NULL AND vendor_client_id = $client_id AND vendor_template = 0"));
     $num_vendors = $row['num'];
     
     $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('login_id') AS num FROM logins WHERE login_archived_at IS NULL AND login_client_id = $client_id"));
diff --git a/post.php b/post.php
index 2c90ff28..b95b627a 100644
--- a/post.php
+++ b/post.php
@@ -1731,6 +1731,99 @@ if(isset($_GET['delete_event'])){
   
 }
 
+//Vendor Templates
+
+if(isset($_POST['add_vendor_template'])){
+
+    $name = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['name'])));
+    $description = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['description'])));
+    $account_number = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['account_number'])));
+    $contact_name = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['contact_name'])));
+    $phone = preg_replace("/[^0-9]/", '',$_POST['phone']);
+    $extension = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['extension'])));
+    $email = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['email'])));
+    $website = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['website'])));
+    $hours = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['hours'])));
+    $sla = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['sla'])));
+    $code = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['code'])));
+    $notes = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['notes'])));
+    
+    mysqli_query($mysqli,"INSERT INTO vendors SET vendor_name = '$name', vendor_description = '$description', vendor_contact_name = '$contact_name', vendor_phone = '$phone', vendor_extension = '$extension', vendor_email = '$email', vendor_website = '$website', vendor_hours = '$hours', vendor_sla = '$sla', vendor_code = '$code', vendor_account_number = '$account_number', vendor_notes = '$notes', vendor_template = 1, vendor_client_id = 0, company_id = $session_company_id");
+
+    $vendor_id = mysqli_insert_id($mysqli);
+
+    //Logging
+    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Vendor Template', log_action = 'Create', log_description = '$session_name created vendor template $name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, company_id = $session_company_id");
+
+    $_SESSION['alert_message'] = "Vendor template <strong>$name</strong> created";
+    
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+}
+
+if(isset($_POST['edit_vendor_template'])){
+
+    $vendor_id = intval($_POST['vendor_id']);
+    $name = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['name'])));
+    $description = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['description'])));
+    $account_number = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['account_number'])));
+    $contact_name = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['contact_name'])));
+    $phone = preg_replace("/[^0-9]/", '',$_POST['phone']);
+    $extension = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['extension'])));
+    $email = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['email'])));
+    $website = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['website'])));
+    $hours = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['hours'])));
+    $sla = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['sla'])));
+    $code = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['code'])));
+    $notes = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['notes'])));
+
+    mysqli_query($mysqli,"UPDATE vendors SET vendor_name = '$name', vendor_description = '$description', vendor_contact_name = '$contact_name', vendor_phone = '$phone', vendor_extension = '$extension', vendor_email = '$email', vendor_website = '$website', vendor_hours = '$hours', vendor_sla = '$sla', vendor_code = '$code',vendor_account_number = '$account_number', vendor_notes = '$notes' WHERE vendor_id = $vendor_id AND company_id = $session_company_id");
+
+    //Logging
+    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Vendor Template', log_action = 'Modify', log_description = '$session_name modified vendor template $name', log_ip = '$session_ip', log_user_agent = '$session_user_agent',  log_user_id = $session_user_id, company_id = $session_company_id");
+
+    $_SESSION['alert_message'] = "Vendor template <strong>$name</strong> modified";
+    
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+}
+
+if(isset($_POST['add_vendor_from_template'])){
+
+    // GET POST Data
+    $client_id = intval($_POST['client_id']); //Used if this vendor is under a contact otherwise its 0 for under company and or template
+    $vendor_template_id = intval($_POST['vendor_template_id']);
+
+    //GET Vendor Info
+    $sql_vendor = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_id = $vendor_template_id AND company_id = $session_company_id");
+
+    $row = mysqli_fetch_array($sql_vendor);
+
+    $name = trim(strip_tags(mysqli_real_escape_string($mysqli,$row['vendor_name'])));
+    $description = trim(strip_tags(mysqli_real_escape_string($mysqli,$row['vendor_description'])));
+    $account_number = trim(strip_tags(mysqli_real_escape_string($mysqli,$row['vendor_account_number'])));
+    $contact_name = trim(strip_tags(mysqli_real_escape_string($mysqli,$row['vendor_contact_name'])));
+    $phone = trim(strip_tags(mysqli_real_escape_string($mysqli,$row['vendor_phone'])));
+    $extension = trim(strip_tags(mysqli_real_escape_string($mysqli,$row['vendor_extension'])));
+    $email = trim(strip_tags(mysqli_real_escape_string($mysqli,$row['vendor_email'])));
+    $website = trim(strip_tags(mysqli_real_escape_string($mysqli,$row['vendor_website'])));
+    $hours = trim(strip_tags(mysqli_real_escape_string($mysqli,$row['vendor_hours'])));
+    $sla = trim(strip_tags(mysqli_real_escape_string($mysqli,$row['vendor_sla'])));
+    $code = trim(strip_tags(mysqli_real_escape_string($mysqli,$row['vendor_code'])));
+    $notes = trim(strip_tags(mysqli_real_escape_string($mysqli,$row['vendor_notes'])));
+
+    // Vendor add query
+    mysqli_query($mysqli,"INSERT INTO vendors SET vendor_name = '$name', vendor_description = '$description', vendor_contact_name = '$contact_name', vendor_phone = '$phone', vendor_extension = '$extension', vendor_email = '$email', vendor_website = '$website', vendor_hours = '$hours', vendor_sla = '$sla', vendor_code = '$code', vendor_account_number = '$account_number', vendor_notes = '$notes', vendor_client_id = $client_id, company_id = $session_company_id");
+
+    $vendor_id = mysqli_insert_id($mysqli);
+
+    // Logging
+    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Vendor', log_action = 'Create', log_description = 'Vendor created from template $name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, company_id = $session_company_id, log_user_id = $session_user_id");
+
+    $_SESSION['alert_message'] = "Vendor created from template";
+    
+     header("Location: " . $_SERVER["HTTP_REFERER"]);
+
+}
+
 // Vendors
 
 if(isset($_POST['add_vendor'])){
@@ -1748,9 +1841,8 @@ if(isset($_POST['add_vendor'])){
     $sla = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['sla'])));
     $code = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['code'])));
     $notes = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['notes'])));
-    $template_id = intval($_POST['template_id']);
     
-    mysqli_query($mysqli,"INSERT INTO vendors SET vendor_name = '$name', vendor_description = '$description', vendor_contact_name = '$contact_name', vendor_phone = '$phone', vendor_extension = '$extension', vendor_email = '$email', vendor_website = '$website', vendor_hours = '$hours', vendor_sla = '$sla', vendor_code = '$code', vendor_account_number = '$account_number', vendor_notes = '$notes', vendor_template_id = $template_id, vendor_client_id = $client_id, company_id = $session_company_id");
+    mysqli_query($mysqli,"INSERT INTO vendors SET vendor_name = '$name', vendor_description = '$description', vendor_contact_name = '$contact_name', vendor_phone = '$phone', vendor_extension = '$extension', vendor_email = '$email', vendor_website = '$website', vendor_hours = '$hours', vendor_sla = '$sla', vendor_code = '$code', vendor_account_number = '$account_number', vendor_notes = '$notes', vendor_client_id = $client_id, company_id = $session_company_id");
 
     $vendor_id = mysqli_insert_id($mysqli);
 
@@ -1777,9 +1869,8 @@ if(isset($_POST['edit_vendor'])){
     $sla = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['sla'])));
     $code = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['code'])));
     $notes = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['notes'])));
-    $template_id = intval($_POST['template_id']);
 
-    mysqli_query($mysqli,"UPDATE vendors SET vendor_name = '$name', vendor_description = '$description', vendor_contact_name = '$contact_name', vendor_phone = '$phone', vendor_extension = '$extension', vendor_email = '$email', vendor_website = '$website', vendor_hours = '$hours', vendor_sla = '$sla', vendor_code = '$code',vendor_account_number = '$account_number', vendor_notes = '$notes', vendor_template_id = $template_id WHERE vendor_id = $vendor_id AND company_id = $session_company_id");
+    mysqli_query($mysqli,"UPDATE vendors SET vendor_name = '$name', vendor_description = '$description', vendor_contact_name = '$contact_name', vendor_phone = '$phone', vendor_extension = '$extension', vendor_email = '$email', vendor_website = '$website', vendor_hours = '$hours', vendor_sla = '$sla', vendor_code = '$code',vendor_account_number = '$account_number', vendor_notes = '$notes' WHERE vendor_id = $vendor_id AND company_id = $session_company_id");
 
     //Logging
     mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Vendor', log_action = 'Modify', log_description = '$session_name modified vendor $name', log_ip = '$session_ip', log_user_agent = '$session_user_agent',  log_user_id = $session_user_id, company_id = $session_company_id");
diff --git a/user_profile.php b/user_profile.php
index 7a9e7e33..f2f03754 100644
--- a/user_profile.php
+++ b/user_profile.php
@@ -148,7 +148,7 @@ $sql_recent_logs = mysqli_query($mysqli,"SELECT * FROM logs
   <div class="col-md-3">
     <div class="card card-dark">
       <div class="card-header py-3">
-        <h3 class="card-title"><i class="fa fa-fw fa-sign-in-alt"></i> Your Recent Logins</h3>
+        <h3 class="card-title"><i class="fa fa-fw fa-sign-in-alt"></i> Your Recent Sign ins</h3>
       </div>
       <table class="table table-borderless table-sm">
         <tbody>
diff --git a/vendor_add_from_template_modal.php b/vendor_add_from_template_modal.php
new file mode 100644
index 00000000..d0d05a35
--- /dev/null
+++ b/vendor_add_from_template_modal.php
@@ -0,0 +1,51 @@
+<div class="modal" id="addVendorFromTemplateModal" tabindex="-1">
+  <div class="modal-dialog">
+    <div class="modal-content bg-dark">
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-fw fa-building"></i> New Vendor from Template</h5>
+        <button type="button" class="close text-white" data-dismiss="modal">
+          <span>&times;</span>
+        </button>
+      </div>
+      <form action="post.php" method="post" autocomplete="off">
+
+        <input type="hidden" name="client_id" value="<?php if(isset($_GET['client_id'])){ echo $client_id; }else{ echo 0; } ?>">
+        
+        <div class="modal-body bg-white">
+
+          <label>Template</label>
+          <div class="form-group">
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-fw fa-puzzle-piece"></i></span>
+              </div>
+              <select class="form-control" name="vendor_template_id" required>
+                <option value="">- Select Template -</option>
+                <?php
+                $sql_vendor_templates = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_template = 1 AND company_id = $session_company_id AND vendor_archived_at IS NULL ORDER BY vendor_name ASC");
+                while($row = mysqli_fetch_array($sql_vendor_templates)){
+                  $vendor_template_id = $row['vendor_id'];
+                  $vendor_template_name = htmlentities($row['vendor_name']);
+
+                ?>
+                <option value="<?php echo $vendor_template_id ?>"><?php echo $vendor_template_name; ?></option>
+                <?php
+                } 
+                ?>
+                
+              </select>
+            </div>
+          </div>
+        
+        </div>
+        
+        <div class="modal-footer bg-white">
+
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_vendor_from_template" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create Vendor</button>
+
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/vendor_add_modal.php b/vendor_add_modal.php
index 7aa3e4c7..48555488 100644
--- a/vendor_add_modal.php
+++ b/vendor_add_modal.php
@@ -10,7 +10,6 @@
       <form action="post.php" method="post" autocomplete="off">
        
         <input type="hidden" name="client_id" value="<?php if(isset($_GET['client_id'])){ echo $client_id; }else{ echo 0; } ?>">
-        <input type="hidden" name="template_id" value="0">
 
         <div class="modal-body bg-white">
 
diff --git a/vendor_edit_modal.php b/vendor_edit_modal.php
index d1478d03..db2f8ea9 100644
--- a/vendor_edit_modal.php
+++ b/vendor_edit_modal.php
@@ -9,7 +9,6 @@
       </div>
       <form action="post.php" method="post" autocomplete="off">
         <input type="hidden" name="vendor_id" value="<?php echo $vendor_id; ?>">
-        <input type="hidden" name="template_id" value="0">
         <div class="modal-body bg-white">
 
           <ul class="nav nav-pills nav-justified mb-3">
diff --git a/vendor_template_add_modal.php b/vendor_template_add_modal.php
index fe4a6b68..e4143a7f 100644
--- a/vendor_template_add_modal.php
+++ b/vendor_template_add_modal.php
@@ -1,4 +1,4 @@
-<div class="modal" id="addVendorModal" tabindex="-1">
+<div class="modal" id="addVendorTemplateModal" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
@@ -51,6 +51,16 @@
                 </div>
               </div>
 
+              <div class="form-group">
+                <label>Account Number</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-fingerprint"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="account_number" placeholder="Account number">
+                </div>
+              </div>
+
               <div class="form-group">
                 <label>Account Manager</label>
                 <div class="input-group">
@@ -111,6 +121,16 @@
                   <input type="text" class="form-control" name="website" placeholder="Do not include http(s)://">
                 </div>
               </div>
+
+              <div class="form-group">
+                <label>Pin/Code</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="code" placeholder="Access Code or Pin">
+                </div>
+              </div>
               
               <div class="form-group">
                 <label>SLA</label>
@@ -137,7 +157,7 @@
         </div>
         <div class="modal-footer bg-white">
           <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_vendor" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
+          <button type="submit" name="add_vendor_template" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create Template</button>
         </div>
       </form>
     </div>
diff --git a/vendor_template_edit_modal.php b/vendor_template_edit_modal.php
new file mode 100644
index 00000000..9025a7d5
--- /dev/null
+++ b/vendor_template_edit_modal.php
@@ -0,0 +1,163 @@
+<div class="modal" id="editVendorTemplateModal<?php echo $vendor_id; ?>" tabindex="-1">
+  <div class="modal-dialog">
+    <div class="modal-content bg-dark">
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-fw fa-building"></i> Editing vendor template: <strong><?php echo $vendor_name; ?></strong></h5>
+        <button type="button" class="close text-white" data-dismiss="modal">
+          <span>&times;</span>
+        </button>
+      </div>
+      <form action="post.php" method="post" autocomplete="off">
+        <input type="hidden" name="vendor_id" value="<?php echo $vendor_id; ?>">
+        <div class="modal-body bg-white">
+
+          <ul class="nav nav-pills nav-justified mb-3">
+            <li class="nav-item">
+              <a class="nav-link active" data-toggle="pill" href="#pills-details<?php echo $vendor_id; ?>">Details</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" data-toggle="pill" href="#pills-support<?php echo $vendor_id; ?>">Support</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" data-toggle="pill" href="#pills-notes<?php echo $vendor_id; ?>">Notes</a>
+            </li>
+          </ul>
+
+          <hr>
+          
+          <div class="tab-content">
+
+            <div class="tab-pane fade show active" id="pills-details<?php echo $vendor_id; ?>">
+
+              <div class="form-group">
+                <label>Vendor Name <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="name" placeholder="Vendor Name" value="<?php echo "$vendor_name"; ?>" required>
+                </div>
+              </div>
+              
+              <div class="form-group">
+                <label>Description</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="description" placeholder="Description" value="<?php echo $vendor_description; ?>">
+                </div>
+              </div>
+
+              <div class="form-group">
+                <label>Account Number</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-fingerprint"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="account_number" placeholder="Account number" value="<?php echo $vendor_account_number; ?>">
+                </div>
+              </div>
+
+              <div class="form-group">
+                <label>Account Manager</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="contact_name" value="<?php echo $vendor_contact_name; ?>" placeholder="Vendor contact name">
+                </div>
+              </div>
+
+            </div>
+            
+            <div class="tab-pane fade" id="pills-support<?php echo $vendor_id; ?>">
+
+              <label>Support Phone</label>
+              <div class="form-row">
+                <div class="col-8">
+                  <div class="form-group">
+                    <div class="input-group">
+                      <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
+                      </div>
+                      <input type="text" class="form-control" name="phone" placeholder="Phone Number" value="<?php echo $vendor_phone; ?>"> 
+                    </div>
+                  </div>
+                </div>
+                <div class="col-4">
+                  <input type="text" class="form-control" name="extension" placeholder="Prompts" value="<?php echo $vendor_extension; ?>">
+                </div>
+              </div>
+
+              <div class="form-group">
+                <label>Support Hours</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="hours" placeholder="Support Hours" value="<?php echo $vendor_hours; ?>">
+                </div>
+              </div>
+              
+              <div class="form-group">
+                <label>Support Email</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
+                  </div>
+                  <input type="email" class="form-control" name="email" placeholder="Support Email" value="<?php echo $vendor_email; ?>">
+                </div>
+              </div>
+              
+              <div class="form-group">
+                <label>Support Website URL</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="website" placeholder="Do not include http(s)://" value="<?php echo $vendor_website; ?>">
+                </div>
+              </div>
+
+              <div class="form-group">
+                <label>SLA</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-handshake"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="sla" placeholder="SLA Response Time" value="<?php echo $vendor_sla; ?>">
+                </div>
+              </div>
+
+              <div class="form-group">
+                <label>Pin/Code</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="code" placeholder="Access Code or Pin" value="<?php echo $vendor_code; ?>">
+                </div>
+              </div>
+            
+            </div>
+
+            <div class="tab-pane fade" id="pills-notes<?php echo $vendor_id; ?>">
+              
+              <div class="form-group">
+                <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"><?php echo $vendor_notes; ?></textarea>
+              </div>
+
+            </div>
+
+          </div>
+          
+        </div>
+        <div class="modal-footer bg-white">
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="edit_vendor_template" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check"></i> Update Template</button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
diff --git a/vendors.php b/vendors.php
index c1af5354..da0150ed 100644
--- a/vendors.php
+++ b/vendors.php
@@ -32,7 +32,8 @@ if(!empty($_GET['dtf'])){
 $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
 
 $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM vendors 
-  WHERE vendor_client_id = 0 
+  WHERE vendor_client_id = 0
+  AND vendor_template = 0 
   AND DATE(vendor_created_at) BETWEEN '$dtf' AND '$dtt'
   AND (vendor_name LIKE '%$q%' OR vendor_description LIKE '%$q%' OR vendor_account_number LIKE '%$q%' OR vendor_website LIKE '%$q%' OR vendor_contact_name LIKE '%$q%' OR vendor_email LIKE '%$q%' OR vendor_phone LIKE '%$phone_query%')
   AND vendor_archived_at IS NULL