diff --git a/post.php b/post.php
index 2d887a1c..9d600ecb 100644
--- a/post.php
+++ b/post.php
@@ -218,20 +218,8 @@ if(isset($_POST['edit_general_settings'])){
     $old_aes_key = $config_aes_key;
     $config_aes_key = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_aes_key']));
     $config_base_url = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_base_url']));
-    
-    $path = "$config_invoice_logo";
 
-    if($_FILES['file']['tmp_name']!='') {
-        //delete old avatar file
-        unlink($path);
-        //Update with new path
-        $path = "uploads/settings/$session_company_id/";
-        $path = $path . basename( $_FILES['file']['name']);
-        $file_name = basename($path);
-        move_uploaded_file($_FILES['file']['tmp_name'], $path);   
-    }
-
-    mysqli_query($mysqli,"UPDATE settings SET config_invoice_logo = '$path', config_api_key = '$config_api_key', config_aes_key = '$config_aes_key', config_base_url = '$config_base_url' WHERE company_id = $session_company_id");
+    mysqli_query($mysqli,"UPDATE settings SET config_api_key = '$config_api_key', config_aes_key = '$config_aes_key', config_base_url = '$config_base_url' WHERE company_id = $session_company_id");
 
     //Update AES key on client_logins if changed
     if($old_aes_key != $config_aes_key){
@@ -267,7 +255,19 @@ if(isset($_POST['edit_company_settings'])){
     $config_company_phone = preg_replace("/[^0-9]/", '',$config_company_phone);
     $config_company_site = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_site']));
 
-    mysqli_query($mysqli,"UPDATE settings SET config_company_name = '$config_company_name', config_company_country = '$config_company_country', config_company_address = '$config_company_address', config_company_city = '$config_company_city', config_company_state = '$config_company_state', config_company_zip = '$config_company_zip', config_company_phone = '$config_company_phone', config_company_site = '$config_company_site' WHERE company_id = $session_company_id");
+    $path = "$config_invoice_logo";
+
+    if($_FILES['file']['tmp_name']!='') {
+        //delete old avatar file
+        unlink($path);
+        //Update with new path
+        $path = "uploads/settings/$session_company_id/";
+        $path = $path . basename( $_FILES['file']['name']);
+        $file_name = basename($path);
+        move_uploaded_file($_FILES['file']['tmp_name'], $path);   
+    }
+
+    mysqli_query($mysqli,"UPDATE settings SET config_company_name = '$config_company_name', config_company_country = '$config_company_country', config_company_address = '$config_company_address', config_company_city = '$config_company_city', config_company_state = '$config_company_state', config_company_zip = '$config_company_zip', config_company_phone = '$config_company_phone', config_company_site = '$config_company_site', config_invoice_logo = '$path' WHERE company_id = $session_company_id");
 
     //Logging
     mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Settings', log_action = 'Modified', log_description = 'Company', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id");
diff --git a/settings-company.php b/settings-company.php
index f5e9355e..bb7b4c04 100644
--- a/settings-company.php
+++ b/settings-company.php
@@ -7,7 +7,7 @@
     <h6 class="float-left mt-1"><i class="fa fa-fw fa-building mr-2"></i>Company Settings</h6>
   </div>
   <div class="card-body">
-    <form class="p-3" action="post.php" method="post"  autocomplete="off">
+    <form class="p-3" action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
       <div class="form-group">
         <label>Company Name</label>
         <div class="input-group">
@@ -88,7 +88,7 @@
         </div>
       </div>
 
-      <div class="form-group mb-5">
+      <div class="form-group">
         <label>Website</label>
         <div class="input-group">
           <div class="input-group-prepend">
@@ -97,6 +97,18 @@
           <input type="text" class="form-control" name="config_company_site" placeholder="Website address https://" value="<?php echo $config_company_site; ?>" >
         </div>
       </div>
+
+      <div class="form-group mb-4">
+        <label>Logo</label>
+        <input type="file" class="form-control-file" name="file">
+      </div>
+
+      <div class="card col-md-2">
+        <div class="card-body">
+          <img class="img-fluid" src="<?php echo $config_invoice_logo; ?>">
+        </div>
+        
+      </div>
       
       <hr>
       
diff --git a/settings-general.php b/settings-general.php
index dcfabdc1..47aa954b 100644
--- a/settings-general.php
+++ b/settings-general.php
@@ -7,7 +7,7 @@
     <h6 class="float-left mt-1"><i class="fa fa-cog mr-2"></i>General Settings</h6>
   </div>
   <div class="card-body">
-    <form class="p-3" action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
+    <form class="p-3" action="post.php" method="post" autocomplete="off">
 
       <div class="form-group">
         <label>API Key</label>
@@ -40,18 +40,6 @@
         </div>
         <small class="form-text text-muted">This is used by cron to send the correct url for invoice guest views</small>
       </div>
-
-      <div class="form-group mb-4">
-        <label>Logo</label>
-        <input type="file" class="form-control-file" name="file">
-      </div>
-
-      <div class="card col-md-2">
-        <div class="card-body">
-          <img class="img-fluid" src="<?php echo $config_invoice_logo; ?>">
-        </div>
-        
-      </div>
       
       <hr>