diff --git a/agent/modals/client/client_add.php b/agent/modals/client/client_add.php
index cee2b23e..644b7d00 100644
--- a/agent/modals/client/client_add.php
+++ b/agent/modals/client/client_add.php
@@ -15,7 +15,7 @@ ob_start();
 ?>
 
 <div class="modal-header bg-dark">
-    <h5 class="modal-title"><i class="fa fa-fw fa-user-plus mr-2"></i>Creating New <?php if($leads_filter == 0){ echo "Client"; } else { echo "Lead"; } ?></h5>
+    <h5 class="modal-title"><i class="fa fa-fw fa-user-plus mr-2"></i>New <?php if($leads_filter == 0){ echo "Client"; } else { echo "Lead"; } ?></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
     </button>
@@ -328,21 +328,6 @@ ob_start();
                         </div>
                     </div>
 
-                    <div class="form-group">
-                        <label>Currency <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-money-bill"></i></span>
-                            </div>
-                            <select class="form-control select2" name="currency_code" required>
-                                <option value="">- Select Currency -</option>
-                                <?php foreach($currencies_array as $currency_code => $currency_name) { ?>
-                                    <option <?php if ($session_company_currency == $currency_code) { echo "selected"; } ?> value="<?php echo $currency_code; ?>"><?php echo "$currency_code - $currency_name"; ?></option>
-                                <?php } ?>
-                            </select>
-                        </div>
-                    </div>
-
                     <div class="form-group">
                         <label>Payment Terms</label>
                         <div class="input-group">
@@ -380,7 +365,7 @@ ob_start();
         </div>
     </div>
     <div class="modal-footer">
-        <button type="submit" name="add_client" class="btn btn-primary text-bold" onclick="promptPrimaryContact()"><i class="fa fa-check mr-2"></i>Create</button>
+        <button type="submit" name="add_client" class="btn btn-primary text-bold" onclick="promptPrimaryContact()"><i class="fa fa-check mr-2"></i>Create Client</button>
         <button type="button" class="btn btn-outline-secondary" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Close</button>
     </div>
 </form>
diff --git a/agent/modals/client/client_edit.php b/agent/modals/client/client_edit.php
index ad25b911..74f2939b 100644
--- a/agent/modals/client/client_edit.php
+++ b/agent/modals/client/client_edit.php
@@ -12,7 +12,6 @@ $client_is_lead = intval($row['client_lead']);
 $client_type = nullable_htmlentities($row['client_type']);
 $client_website = nullable_htmlentities($row['client_website']);
 $client_referral = nullable_htmlentities($row['client_referral']);
-$client_currency_code = nullable_htmlentities($row['client_currency_code']);
 $client_net_terms = intval($row['client_net_terms']);
 $client_tax_id_number = nullable_htmlentities($row['client_tax_id_number']);
 $client_abbreviation = nullable_htmlentities($row['client_abbreviation']);
@@ -188,25 +187,6 @@ ob_start();
                         </div>
                     </div>
 
-                    <div class="form-group">
-                        <label>Currency <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-money-bill"></i></span>
-                            </div>
-                            <select class="form-control select2" name="currency_code" required>
-                                <option value="">- Currency -</option>
-                                <?php foreach ($currencies_array as $currency_code => $currency_name) { ?>
-                                    <option <?php if ($client_currency_code == $currency_code) {
-                                        echo "selected";
-                                    } ?> value="<?php echo $currency_code; ?>">
-                                        <?php echo "$currency_code - $currency_name"; ?>
-                                    </option>
-                                <?php } ?>
-                            </select>
-                        </div>
-                    </div>
-
                     <div class="form-group">
                         <label>Invoice Net Terms</label>
                         <div class="input-group">
diff --git a/agent/post/client.php b/agent/post/client.php
index 2e4a1aff..9bf10c10 100644
--- a/agent/post/client.php
+++ b/agent/post/client.php
@@ -36,7 +36,7 @@ if (isset($_POST['add_client'])) {
     $extended_log_description = '';
 
     // Create client
-    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_abbreviation = '$abbreviation', 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 = '$session_company_currency', client_net_terms = $net_terms, client_tax_id_number = '$tax_id_number', client_lead = $lead, client_abbreviation = '$abbreviation', client_notes = '$notes', client_accessed_at = NOW()");
 
     $client_id = mysqli_insert_id($mysqli);
 
@@ -133,7 +133,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_abbreviation = '$abbreviation', 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_net_terms = $net_terms, client_tax_id_number = '$tax_id_number', client_lead = $lead, client_abbreviation = '$abbreviation', client_notes = '$notes' WHERE client_id = $client_id");
 
     // Create Referral if it doesn't exist
     $sql = mysqli_query($mysqli, "SELECT category_name FROM categories WHERE category_type = 'Referral' AND category_archived_at IS NULL AND category_name = '$referral'");
diff --git a/agent/post/client_model.php b/agent/post/client_model.php
index c08352ff..df59e821 100644
--- a/agent/post/client_model.php
+++ b/agent/post/client_model.php
@@ -6,7 +6,6 @@ $type = sanitizeInput($_POST['type']);
 $website = preg_replace("(^https?://)", "", sanitizeInput($_POST['website']));
 $referral = sanitizeInput($_POST['referral']);
 $rate = floatval($_POST['rate'] ?? 0);
-$currency_code = sanitizeInput($_POST['currency_code'] ?? $session_company_currency); // So we dont have to to have a hidden form input if module sales is disabled
 $net_terms = intval($_POST['net_terms'] ?? $config_default_net_terms);
 $tax_id_number = sanitizeInput($_POST['tax_id_number'] ?? '');
 $abbreviation = sanitizeInput($_POST['abbreviation']);
diff --git a/agent/post/ticket.php b/agent/post/ticket.php
index 8b88dfb7..422f7113 100644
--- a/agent/post/ticket.php
+++ b/agent/post/ticket.php
@@ -183,7 +183,7 @@ if (isset($_POST['add_ticket'])) {
 
     flash_alert("Ticket <strong>$config_ticket_prefix$ticket_number</strong> created");
 
-    redirect("ticket.php?ticket_id=$ticket_id");
+    redirect("ticket.php?client_id=$client_id&ticket_id=$ticket_id");
 
 }