diff --git a/src/routes/cart/DeliveryModePicker.svelte b/src/routes/cart/DeliveryModePicker.svelte
index 486f1c6e..bbea0e0f 100644
--- a/src/routes/cart/DeliveryModePicker.svelte
+++ b/src/routes/cart/DeliveryModePicker.svelte
@@ -74,6 +74,7 @@
         storeCartItems = newCartItems;
       } else {
         $cartItems = newCartItems;
+        localStorage.setItem("user_cart", JSON.stringify($cartItems));
       }
     }
   };
diff --git a/src/routes/products/CreateProduct.svelte b/src/routes/products/CreateProduct.svelte
index 79b2856b..dbf6359a 100644
--- a/src/routes/products/CreateProduct.svelte
+++ b/src/routes/products/CreateProduct.svelte
@@ -2,7 +2,6 @@
   import { onMount, getContext } from "svelte";
   import Icon from "svelte-awesome";
   import { faChevronLeft } from "@fortawesome/free-solid-svg-icons";
-
   import TransitionWrapper from "./../../components/TransitionWrapper.svelte";
   import GetGraphQLInstance from "./../../services/SheaftGraphQL.js";
   import GetRouterInstance from "./../../services/SheaftRouter.js";
diff --git a/src/routes/products/EditProduct.svelte b/src/routes/products/EditProduct.svelte
index cc15b2be..7d304e29 100644
--- a/src/routes/products/EditProduct.svelte
+++ b/src/routes/products/EditProduct.svelte
@@ -161,11 +161,6 @@
         </div>      
       </div>
       <div class="flex mt-2">
-        <button
-          class={`btn btn-lg bg-white border mr-2 hover:text-white ${product.available ? 'text-orange-500 border-orange-500 hover:bg-orange-500' : 'text-green-500 border-green-500 hover:bg-green-500'}`}
-          on:click={showSetAvailabilityModal}>
-          {product.available ? 'Désactiver' : 'Activer'}
-        </button>
         <button
           class="btn btn-lg bg-white text-red-500 border border-red-500 hover:bg-red-500 hover:text-white"
           on:click={showDeleteModal}>
diff --git a/src/routes/products/ProductForm.svelte b/src/routes/products/ProductForm.svelte
index 901c937a..ef3eb806 100644
--- a/src/routes/products/ProductForm.svelte
+++ b/src/routes/products/ProductForm.svelte
@@ -15,19 +15,22 @@
 	import ReturnableSelectItem from "./ReturnableSelectItem.svelte";
 	import CreateReturnable from "./../returnables/CreateReturnable.svelte";
 	import TagKind from "./../../enums/TagKind.js";
-	import { GET_RETURNABLES, GET_TAGS } from "./queries.js";
+	import { GET_RETURNABLES, GET_TAGS, GET_PRODUCER_DETAILS } from "./queries.js";
 	import ChangeImage from "./ChangeImage.svelte";
 	import { form, bindClass } from "../../../vendors/svelte-forms/src/index";
 	import UnitKind from "../../enums/UnitKind";
 	import ConditioningKind from "../../enums/ConditioningKind";
+  import GetAuthInstance from "../../services/SheaftAuth";
 
 	export let submit, product, isLoading;
 
 	const { open } = getContext("modal");
 	const graphQLInstance = GetGraphQLInstance();
+	const authInstance = GetAuthInstance();
 
 	let isLoadingTags = false;
 	let isLoadingReturnables = false;
+	let notSubjectToVat = false;
 
 	let selectedCategory = null;
 	let returnables = [];
@@ -45,7 +48,7 @@
 				validators: ["required", "min:0.01"],
 				enabled: true,
 			},
-			vat: { value: product.vat, validators: ["required"], enabled: true },
+			vat: { value: product.vat, validators: ["required"], enabled: !notSubjectToVat },
 			unit: { value: product.unit, validators: ["required"], enabled: product.conditioning == ConditioningKind.Bulk.Value},
 			conditioning: {
 				value: product.conditioning,
@@ -128,11 +131,25 @@
 
 	onMount(async () => {
 		isLoading = true;
+		await getProducer();
 		await getTags();
 		await getReturnables();
 		isLoading = false;
 	});
 
+	const getProducer = async () => {
+		var res = await graphQLInstance.query(GET_PRODUCER_DETAILS, {
+			id: authInstance.user.profile.sub
+		});
+
+		if (!res.success) {
+			//TODO
+			return;
+		}
+
+		notSubjectToVat = res.data.notSubjectToVat;
+	}
+
 	const getReturnables = async () => {
 		isLoadingReturnables = true;
 		var res = await graphQLInstance.query(GET_RETURNABLES);
@@ -228,8 +245,8 @@
 			</div>
 			<div class="form-control">
 				<div class="flex w-full">
-					<div class="w-full pr-2">
-						<label for="grid-price">Prix HT *</label>
+					<div class="w-full" class:pr-2={!notSubjectToVat}>
+						<label for="grid-price">{notSubjectToVat ? 'Prix *' : 'Prix HT *'}</label>
 						<input
 							bind:value={product.wholeSalePricePerUnit}
 							use:bindClass={{ form: productForm, name: 'wholeSalePricePerUnit' }}
@@ -242,7 +259,7 @@
 							placeholder="ex : 2.49" />
 						<ErrorContainer field={$productForm.fields.wholeSalePricePerUnit} />
 					</div>
-					<div class="w-full">
+					<div class="w-full" class:hidden={notSubjectToVat}>
 						<label for="grid-vat">TVA *</label>
 						<div
 							class="w-full text-lg justify-center button-group"
diff --git a/src/routes/products/queries.js b/src/routes/products/queries.js
index ed22881e..c323cde0 100644
--- a/src/routes/products/queries.js
+++ b/src/routes/products/queries.js
@@ -76,6 +76,14 @@ export const GET_PRODUCT_DETAILS = gql`
 	}
 `;
 
+export const GET_PRODUCER_DETAILS = gql`
+	query GetProducerDetails($id: ID!) {
+		producer(input: $id) {
+			notSubjectToVat
+		}
+	}
+`
+
 export const GET_PRODUCT_RATINGS = gql`
 	query GetProductRatings($id: ID!) {
 		product(input: $id) {
diff --git a/src/routes/register/RegisterOwner.svelte b/src/routes/register/RegisterOwner.svelte
index c78988ae..8a3f8fef 100644
--- a/src/routes/register/RegisterOwner.svelte
+++ b/src/routes/register/RegisterOwner.svelte
@@ -52,6 +52,7 @@
   let company = {
     name: null,
     openForNewBusiness: true,
+    notSubjectToVat: false,
     address: {
       line1: null,
       line2: null,
diff --git a/src/routes/register/owner/FormCompany.svelte b/src/routes/register/owner/FormCompany.svelte
index 08722cb8..3c7f23b0 100644
--- a/src/routes/register/owner/FormCompany.svelte
+++ b/src/routes/register/owner/FormCompany.svelte
@@ -8,6 +8,7 @@
   import { faInfoCircle } from "@fortawesome/free-solid-svg-icons";
   import Cleave from "cleave.js";
   import "cleave.js/dist/addons/cleave-phone.fr";
+  import InputCheckbox from "./../../../components/controls/InputCheckbox.svelte";
   
   export let company, vat, isStore = false, stepper = 1, errorsHandler = null, invalidSiret = false;
 
@@ -187,7 +188,17 @@
           <label for="country">Pays *</label>
           <CountrySelect bind:selectedValue={company.legals.address.country} formName={companyForm} name="country" {errorsHandler} />
         </div>
-      </div>  
+        {#if !isStore}
+          <div class="mt-2">
+            <label class="cursor-pointer">
+              <InputCheckbox
+                checked={company.notSubjectToVat}
+                onClick={() => (company.notSubjectToVat = !company.notSubjectToVat)} />
+              Mon entreprise n'est pas assujettie à la TVA
+            </label>
+          </div>
+        {/if}
+      </div> 
     </div>
   </fieldset>
 </form>