diff --git a/config/application.yml.default b/config/application.yml.default
index 8327dc659..3ff768622 100644
--- a/config/application.yml.default
+++ b/config/application.yml.default
@@ -22,6 +22,8 @@ FABLAB_WITHOUT_ONLINE_PAYMENT: 'false'
 FABLAB_WITHOUT_INVOICES: 'false'
 PHONE_REQUIRED: 'true'
 
+USER_CONFIRMATION_NEEDED_TO_SIGN_IN: 
+
 EVENTS_IN_CALENDAR: 'false'
 SLOT_DURATION: '60'
 
@@ -100,3 +102,4 @@ MAX_IMPORT_SIZE: '5242880'
 MAX_IMAGE_SIZE: '10485760'
 # 20971520 = 20 megabytes
 MAX_CAO_SIZE: '20971520'
+
diff --git a/config/secrets.yml b/config/secrets.yml
index ab40d2b57..6ede49c28 100644
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -21,6 +21,7 @@ development:
   fablab_without_online_payments: <%= ENV["FABLAB_WITHOUT_ONLINE_PAYMENT"] %>
   fablab_without_invoices: <%= ENV["FABLAB_WITHOUT_INVOICES"] %>
   phone_required: <%= ENV["PHONE_REQUIRED"] %>
+  user_confirmation_needed_to_sign_in: <%= ENV["USER_CONFIRMATION_NEEDED_TO_SIGN_IN"] %>
   events_in_calendar: <%= ENV["EVENTS_IN_CALENDAR"] %>
   slot_duration: <%= ENV["SLOT_DURATION"] %>
   default_host: <%= ENV["DEFAULT_HOST"] %>
@@ -54,7 +55,6 @@ development:
   superadmin_email: <%= ENV["SUPERADMIN_EMAIL"] %>
   recaptcha_site_key: <%= ENV["RECAPTCHA_SITE_KEY"] %>
   recaptcha_secret_key: <%= ENV["RECAPTCHA_SECRET_KEY"] %>
-  user_confirmation_needed_to_sign_in: <%= ENV["USER_CONFIRMATION_NEEDED_TO_SIGN_IN"] %>
 
 test:
   secret_key_base: 83daf5e7b80d990f037407bab78dff9904aaf3c195a50f84fa8695a22287e707dfbd9524b403b1dcf116ae1d8c06844c3d7ed942564e5b46be6ae3ead93a9d30
@@ -67,6 +67,7 @@ test:
   fablab_without_online_payments: false
   fablab_without_invoices: false
   phone_required: true
+  user_confirmation_needed_to_sign_in: <%= ENV["USER_CONFIRMATION_NEEDED_TO_SIGN_IN"] %>
   events_in_calendar: false
   slot_duration: 60
   default_host: <%= ENV["DEFAULT_HOST"] %>
@@ -100,7 +101,6 @@ test:
   superadmin_email: <%= ENV["SUPERADMIN_EMAIL"] %>
   recaptcha_site_key: <%= ENV["RECAPTCHA_SITE_KEY"] %>
   recaptcha_secret_key: <%= ENV["RECAPTCHA_SECRET_KEY"] %>
-  user_confirmation_needed_to_sign_in: <%= ENV["USER_CONFIRMATION_NEEDED_TO_SIGN_IN"] %>
 
 staging:
   secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
@@ -113,6 +113,7 @@ staging:
   fablab_without_online_payments: <%= ENV["FABLAB_WITHOUT_ONLINE_PAYMENT"] %>
   fablab_without_invoices: <%= ENV["FABLAB_WITHOUT_INVOICES"] %>
   phone_required: <%= ENV["PHONE_REQUIRED"] %>
+  user_confirmation_needed_to_sign_in: <%= ENV["USER_CONFIRMATION_NEEDED_TO_SIGN_IN"] %>
   events_in_calendar: <%= ENV["EVENTS_IN_CALENDAR"] %>
   slot_duration: <%= ENV["SLOT_DURATION"] %>
   default_host: <%= ENV["DEFAULT_HOST"] %>
@@ -155,7 +156,6 @@ staging:
   superadmin_email: <%= ENV["SUPERADMIN_EMAIL"] %>
   recaptcha_site_key: <%= ENV["RECAPTCHA_SITE_KEY"] %>
   recaptcha_secret_key: <%= ENV["RECAPTCHA_SECRET_KEY"] %>
-  user_confirmation_needed_to_sign_in: <%= ENV["USER_CONFIRMATION_NEEDED_TO_SIGN_IN"] %>
 
 # Do not keep production secrets in the repository,
 # instead read values from the environment.
@@ -170,6 +170,7 @@ production:
   fablab_without_online_payments: <%= ENV["FABLAB_WITHOUT_ONLINE_PAYMENT"] %>
   fablab_without_invoices: <%= ENV["FABLAB_WITHOUT_INVOICES"] %>
   phone_required: <%= ENV["PHONE_REQUIRED"] %>
+  user_confirmation_needed_to_sign_in: <%= ENV["USER_CONFIRMATION_NEEDED_TO_SIGN_IN"] %>
   events_in_calendar: <%= ENV["EVENTS_IN_CALENDAR"] %>
   slot_duration: <%= ENV["SLOT_DURATION"] %>
   default_host: <%= ENV["DEFAULT_HOST"] %>
@@ -212,4 +213,3 @@ production:
   superadmin_email: <%= ENV["SUPERADMIN_EMAIL"] %>
   recaptcha_site_key: <%= ENV["RECAPTCHA_SITE_KEY"] %>
   recaptcha_secret_key: <%= ENV["RECAPTCHA_SECRET_KEY"] %>
-  user_confirmation_needed_to_sign_in: <%= ENV["USER_CONFIRMATION_NEEDED_TO_SIGN_IN"] %>
diff --git a/doc/environment.md b/doc/environment.md
index 23d962d94..0f54536f4 100644
--- a/doc/environment.md
+++ b/doc/environment.md
@@ -108,6 +108,12 @@ This is useful if you have your own invoicing system and you want to prevent Fab
     PHONE_REQUIRED
 
 If set to 'false' the phone number won't be required to register a new user on the software.
+
+<a name="USER_CONFIRMATION_NEEDED_TO_SIGN_IN"></a>
+
+    USER_CONFIRMATION_NEEDED_TO_SIGN_IN
+
+If set to 'true' (or any non empty string) the users will need to confirm their email address to be able to sign in. Keep this variable empty if you don't want this behaviour.
 <a name="EVENTS_IN_CALENDAR"></a>
 
     EVENTS_IN_CALENDAR