diff --git a/invoice.php b/invoice.php
index 37424d4f..775926a3 100644
--- a/invoice.php
+++ b/invoice.php
@@ -234,7 +234,7 @@ if(isset($_GET['invoice_id'])){
                 <th class="d-print-none"></th>
                 <th>Item</th>
                 <th>Description</th>
-                <th class="text-center">QTY</th>
+                <th class="text-center">Qty</th>
                 <th class="text-right">Price</th>
                 <th class="text-right">Tax</th>
                 <th class="text-right">Total</th>
@@ -935,4 +935,4 @@ $('#item').typeahead({
 });
 
 
-</script>
\ No newline at end of file
+</script>
diff --git a/quote.php b/quote.php
index e22749ae..9e46e13a 100644
--- a/quote.php
+++ b/quote.php
@@ -198,7 +198,7 @@ if(isset($_GET['quote_id'])){
                 <th class="d-print-none"></th>
                 <th>Item</th>
                 <th>Description</th>
-                <th class="text-center">QTY</th>
+                <th class="text-center">Qty</th>
                 <th class="text-right">Price</th>
                 <th class="text-right">Tax</th>
                 <th class="text-right">Total</th>
@@ -738,4 +738,4 @@ var docDefinition = {
     }
     };
 
-</script>
\ No newline at end of file
+</script>
diff --git a/recurring_invoice.php b/recurring_invoice.php
index 21d0594b..d565d98a 100644
--- a/recurring_invoice.php
+++ b/recurring_invoice.php
@@ -178,7 +178,7 @@ if(isset($_GET['recurring_id'])){
                 <th class="d-print-none"></th>
                 <th>Item</th>
                 <th>Description</th>
-                <th class="text-center">QTY</th>
+                <th class="text-center">Qty</th>
                 <th class="text-right">Price</th>
                 <th class="text-right">Tax</th>
                 <th class="text-right">Total</th>
@@ -362,4 +362,4 @@ if(isset($_GET['recurring_id'])){
 
 include("footer.php");
 
-?>
\ No newline at end of file
+?>
diff --git a/setup.php b/setup.php
index 94050371..77dc43ff 100644
--- a/setup.php
+++ b/setup.php
@@ -591,7 +591,7 @@ if(isset($_POST['add_company_settings'])){
                     <select class="form-control select2" name="currency_code" required>
                       <option value="">- Currency -</option>
                       <?php foreach($currencies_array as $currency_code => $currency_name) { ?>
-                      <option><?php echo "$currency_code - $currency_name"; ?></option>
+                      <option value="<?php echo $currency_code; ?>"><?php echo "$currency_code - $currency_name"; ?></option>
                       <?php } ?>
                     </select>
                   </div>
@@ -660,4 +660,4 @@ if(isset($_POST['add_company_settings'])){
 
 </body>
 
-</html>
\ No newline at end of file
+</html>