diff --git a/doc/environment.md b/doc/environment.md
index c67dceae8..0998f0a86 100644
--- a/doc/environment.md
+++ b/doc/environment.md
@@ -107,8 +107,7 @@ This is useful if you have your own invoicing system and you want to prevent Fab
     FABLAB_WITHOUT_WALLET
 
 If set to 'true', the wallet will be disabled.
-This is useful if you won't use wallet system
-**Very important**: if you disable invoices, you still have to configure VAT in the interface to prevent errors in accounting and prices.
+This is useful if you won't use wallet system.
 <a name="PHONE_REQUIRED"></a>
 
     PHONE_REQUIRED
diff --git a/setup/setup.sh b/setup/setup.sh
index e72557972..6935f23f7 100755
--- a/setup/setup.sh
+++ b/setup/setup.sh
@@ -210,7 +210,7 @@ configure_env_file()
 
   local doc variables secret
   doc=$(\curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/doc/environment.md)
-  variables=(STRIPE_API_KEY STRIPE_PUBLISHABLE_KEY STRIPE_CURRENCY INVOICE_PREFIX FABLAB_WITHOUT_PLANS FABLAB_WITHOUT_SPACES FABLAB_WITHOUT_ONLINE_PAYMENT FABLAB_WITHOUT_INVOICES \
+  variables=(STRIPE_API_KEY STRIPE_PUBLISHABLE_KEY STRIPE_CURRENCY INVOICE_PREFIX FABLAB_WITHOUT_PLANS FABLAB_WITHOUT_SPACES FABLAB_WITHOUT_ONLINE_PAYMENT FABLAB_WITHOUT_INVOICES FABLAB_WITHOUT_WALLET \
    PHONE_REQUIRED USER_CONFIRMATION_NEEDED_TO_SIGN_IN EVENTS_IN_CALENDAR SLOT_DURATION DEFAULT_MAIL_FROM DELIVERY_METHOD DEFAULT_HOST DEFAULT_PROTOCOL SMTP_ADDRESS SMTP_PORT SMTP_USER_NAME SMTP_PASSWORD SMTP_AUTHENTICATION \
    SMTP_ENABLE_STARTTLS_AUTO SMTP_OPENSSL_VERIFY_MODE SMTP_TLS GA_ID RECAPTCHA_SITE_KEY RECAPTCHA_SECRET_KEY DISQUS_SHORTNAME TWITTER_NAME \
    FACEBOOK_APP_ID LOG_LEVEL ALLOWED_EXTENSIONS ALLOWED_MIME_TYPES MAX_IMAGE_SIZE MAX_CAO_SIZE MAX_IMPORT_SIZE DISK_SPACE_MB_ALERT FEATURE_TOUR_BEHAVIOR \