diff --git a/golem_activity_queue/models/golem_activity.py b/golem_activity_queue/models/golem_activity.py
index 7ef61f2..752d9d4 100644
--- a/golem_activity_queue/models/golem_activity.py
+++ b/golem_activity_queue/models/golem_activity.py
@@ -40,7 +40,13 @@ class GolemActivity(models.Model):
     @api.multi
     def queue_allowed_toggle(self):
         for activity in self:
-            activity.queue_allowed = not activity.queue_allowed
+            if activity.queue_allowed:
+                activity.queue_allowed = not activity.queue_allowed
+                activity.automated_registration_from_queue = False
+            else:
+                activity.queue_allowed = not activity.queue_allowed
+
+
 
     #contraint sur nombre d'inscription : une desincription declanche une inscription depuis attente
     @api.multi
diff --git a/golem_activity_queue/views/golem_activity_views.xml b/golem_activity_queue/views/golem_activity_views.xml
index 8dcd8e5..e1a1998 100644
--- a/golem_activity_queue/views/golem_activity_views.xml
+++ b/golem_activity_queue/views/golem_activity_views.xml
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       <!--Ajout du case file d'attente et inscription automatisé sur activity form-->
       <xpath expr="//field[@name='is_overbooked']" position="after">
         <field name="queue_allowed"/>
-        <field name="automated_registration_from_queue"/>
+        <field name="automated_registration_from_queue" attrs="{'readonly': [('queue_allowed','=', False )]}"/>
       </xpath>
       <!--Ajout du bouton inscription en file d'attente sur activity form-->
       <xpath expr="//field[@name='activity_registration_ids']" position="after">
@@ -41,7 +41,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       </xpath>
       <!--Ajout onglet queue sur activity form-->
     <xpath expr="//page[@name='invoicing']" position="before">
-        <page name="queue" string="Queue">
+        <page name="queue" string="Queue" attrs="{'invisible': [('queue_allowed', '=', False)]}">
           <group>
             <field name="queue_activity_number" readonly='1'/>
             <field name="activity_queue_ids"