diff --git a/client_add_modal.php b/client_add_modal.php
index c54c3cab..ab084b5e 100644
--- a/client_add_modal.php
+++ b/client_add_modal.php
@@ -2,15 +2,13 @@
     <div class="modal-dialog">
         <div class="modal-content bg-dark">
             <div class="modal-header">
-                <h5 class="modal-title"><i class="fa fa-fw fa-user-plus mr-2"></i>Create <?php if (isset($lead)){ echo "Lead";} else { echo "Client";}?></h5>
+                <h5 class="modal-title"><i class="fa fa-fw fa-user-plus mr-2"></i>Create <?php if($leads == 0){ echo "Client"; } else { echo "Lead"; } ?></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_lead" value="<?php 
-                if (isset($lead)){ echo "1";} else { echo "0";}
-                ?>">
+                <input type="hidden" name="lead" value="0">
                 <div class="modal-body bg-white">
 
                     <ul class="nav nav-pills nav-justified mb-3">
@@ -94,12 +92,11 @@
                                 <label><i class="fas fa-fw fa-bullhorn mr-2"></i>Is Lead</label>
                                 <div class="input-group">
                                     <div class="input-group-prepend">
-                                        <input type="checkbox" name="lead" value="1">
+                                        <input type="checkbox" name="lead" value="1" <?php if($leads == 1){ echo "checked"; } ?>>
                                     </div>
                                 </div>
                             </div>
 
-
                         </div>
 
                         <div class="tab-pane fade" id="pills-location">
@@ -236,9 +233,7 @@
 
                         <div class="tab-pane fade" id="pills-additional">
 
-                            <?php if ($config_module_enable_accounting) {
-                                    if (!isset($lead)) {
-                                ?>
+                            <?php if ($config_module_enable_accounting) { ?>
 
                                 <div class="form-group">
                                     <label>Hourly Rate</label>
@@ -292,7 +287,7 @@
                             <?php } else { ?>
                                 <input type="hidden" name="currency_code" value="<?php echo $session_company_currency; ?>">
                                 <input type="hidden" name="net_terms" value="0">
-                            <?php } }?>
+                            <?php } ?>
 
                             <div class="form-group">
                                 <label>Notes</label>
diff --git a/client_edit_modal.php b/client_edit_modal.php
index 05ca6b5b..f5ae5d7a 100644
--- a/client_edit_modal.php
+++ b/client_edit_modal.php
@@ -11,6 +11,7 @@
             </div>
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <input type="hidden" name="lead" value="0">
                 <div class="modal-body bg-white">
 
                     <ul class="nav nav-pills nav-justified mb-3">
@@ -18,12 +19,10 @@
                             <a class="nav-link active" data-toggle="pill"
                                 href="#pills-client-details<?php echo $client_id; ?>">Details</a>
                         </li>
-                        <?php if (!isset($lead)) { ?>
                         <li class="nav-item">
                             <a class="nav-link" data-toggle="pill"
                                 href="#pills-client-billing<?php echo $client_id; ?>">Billing</a>
                         </li>
-                        <?php } ?>
                         <li class="nav-item">
                             <a class="nav-link" data-toggle="pill"
                                 href="#pills-client-notes<?php echo $client_id; ?>">Notes</a>
diff --git a/clients.php b/clients.php
index 45bd3b9c..1c951f40 100644
--- a/clients.php
+++ b/clients.php
@@ -51,12 +51,13 @@ $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-user-friends mr-2"></i>Client Management</h3>
+            <h3 class="card-title mt-2"><i class="fa fa-fw fa-user-friends mr-2"></i><?php if($leads == 0){ echo "Client"; } else { echo "Lead"; } ?> Management</h3>
             <div class="card-tools">
                 <?php if ($session_user_role == 3) { ?>
                     <div class="btn-group">
                         <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addClientModal">
-                            <i class="fas fa-plus mr-2"></i>New Client
+                            <i class="fas fa-plus mr-2"></i>New
+                            <?php if($leads == 0){ echo "Client"; } else { echo "Lead"; } ?>
                         </button>
                         <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                         <div class="dropdown-menu">
@@ -75,7 +76,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 <div class="row">
                     <div class="col-md-4">
                         <div class="input-group">
-                            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search clients" autofocus>
+                            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search <?php if($leads == 0){ echo "clients"; } else { echo "leads"; } ?>" autofocus>
                             <div class="input-group-append">
                                 <button class="btn btn-secondary" type="button" data-toggle="collapse" data-target="#advancedFilter"><i class="fas fa-filter"></i></button>
                                 <button class="btn btn-primary"><i class="fa fa-search"></i></button>
@@ -83,10 +84,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         </div>
                     </div>
                     <div class="col-md-8">
-                        <div class="float-right">
+                        <div class="btn-group float-right">
                             <a href="?leads=0" class="btn btn-<?php if($leads == 0){ echo "primary"; } else { echo "default"; } ?>"><i class="fa fa-fw fa-user-friends mr-2"></i>Clients</a>
                             <a href="?leads=1" class="btn btn-<?php if($leads == 1){ echo "primary"; } else { echo "default"; } ?>"><i class="fa fa-fw fa-bullhorn mr-2"></i>Leads</a>
-                        </div>
+                        </div> 
                     </div>
                 </div>
                 <div class="collapse mt-3 <?php if (!empty($_GET['dtf']) || $_GET['canned_date'] !== "custom" ) { echo "show"; } ?>" id="advancedFilter">
diff --git a/post/client.php b/post/client.php
index dc9990ca..efc99a47 100644
--- a/post/client.php
+++ b/post/client.php
@@ -26,7 +26,7 @@ if (isset($_POST['add_client'])) {
 
     $extended_log_description = '';
 
-    mysqli_query($mysqli, "INSERT INTO clients SET client_name = '$name', client_type = '$type', client_website = '$website', client_referral = '$referral', client_rate = $rate, client_currency_code = '$currency_code', client_net_terms = $net_terms, client_tax_id_number = '$tax_id_number', client_lead = '$lead', client_notes = '$notes', client_accessed_at = NOW()");
+    mysqli_query($mysqli, "INSERT INTO clients SET client_name = '$name', client_type = '$type', client_website = '$website', client_referral = '$referral', client_rate = $rate, client_currency_code = '$currency_code', client_net_terms = $net_terms, client_tax_id_number = '$tax_id_number', client_lead = $lead, client_notes = '$notes', client_accessed_at = NOW()");
 
     $client_id = mysqli_insert_id($mysqli);
 
@@ -115,7 +115,7 @@ if (isset($_POST['edit_client'])) {
 
     $client_id = intval($_POST['client_id']);
 
-    mysqli_query($mysqli, "UPDATE clients SET client_name = '$name', client_type = '$type', client_website = '$website', client_referral = '$referral', client_rate = $rate, client_currency_code = '$currency_code', client_net_terms = $net_terms, client_tax_id_number = '$tax_id_number', client_lead = '$lead', client_notes = '$notes' WHERE client_id = $client_id");
+    mysqli_query($mysqli, "UPDATE clients SET client_name = '$name', client_type = '$type', client_website = '$website', client_referral = '$referral', client_rate = $rate, client_currency_code = '$currency_code', client_net_terms = $net_terms, client_tax_id_number = '$tax_id_number', client_lead = $lead, client_notes = '$notes' WHERE client_id = $client_id");
 
     //Tags
     //Delete existing tags