diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php
index 73006f39bab1..7b04edb733fe 100644
--- a/app/Http/Controllers/InvoiceController.php
+++ b/app/Http/Controllers/InvoiceController.php
@@ -326,7 +326,7 @@ class InvoiceController extends BaseController
         if ($clientPublicId) {
             $clientId = Client::getPrivateId($clientPublicId);
         }
-
+        
         $invoice = $account->createInvoice($entityType, $clientId);
         $invoice->public_id = 0;
         
diff --git a/app/Http/Middleware/StartupCheck.php b/app/Http/Middleware/StartupCheck.php
index 8f42b9355cd8..5bc4d543204a 100644
--- a/app/Http/Middleware/StartupCheck.php
+++ b/app/Http/Middleware/StartupCheck.php
@@ -34,7 +34,7 @@ class StartupCheck
 
         // Ensure all request are over HTTPS in production
         if (Utils::requireHTTPS() && !Request::secure()) {
-            //return Redirect::secure(Request::getRequestUri());
+            return Redirect::secure(Request::getRequestUri());
         }
 
         // If the database doens't yet exist we'll skip the rest
diff --git a/app/Ninja/Repositories/InvoiceRepository.php b/app/Ninja/Repositories/InvoiceRepository.php
index be6e625b1f73..7ab30fee05bf 100644
--- a/app/Ninja/Repositories/InvoiceRepository.php
+++ b/app/Ninja/Repositories/InvoiceRepository.php
@@ -138,13 +138,13 @@ class InvoiceRepository extends BaseRepository
 
         if ($isNew) {
             $entityType = ENTITY_INVOICE;
-            if (isset($data['is_recurring']) && $data['is_recurring']) {
+            if (isset($data['is_recurring']) && filter_var($data['is_recurring'], FILTER_VALIDATE_BOOLEAN)) {
                 $entityType = ENTITY_RECURRING_INVOICE;
-            } elseif (isset($data['is_quote']) && $data['is_quote']) {
+            } elseif (isset($data['is_quote']) && filter_var($data['is_quote'], FILTER_VALIDATE_BOOLEAN)) {
                 $entityType = ENTITY_QUOTE;
             }
             $invoice = $account->createInvoice($entityType, $data['client_id']);
-            if (isset($data['has_tasks']) && $data['has_tasks']) {
+            if (isset($data['has_tasks']) && filter_var($data['has_tasks'], FILTER_VALIDATE_BOOLEAN)) {
                 $invoice->has_tasks = true;
             }
         } else {