diff --git a/golem_activity_queue/models/golem_member.py b/golem_activity_queue/models/golem_member.py
index bb9cb3c..8b9c13a 100644
--- a/golem_activity_queue/models/golem_member.py
+++ b/golem_activity_queue/models/golem_member.py
@@ -24,6 +24,33 @@ class GolemMember(models.Model):
 
     @api.onchange('activity_registration_ids')
     def _checkRemain(self):
+        """print "#####################################"
+        print len(self.activity_registration_ids)
+        for reservation in self.activity_registration_ids:
+            print reservation.activity_id.name"""
+
+        for reservation in self.activity_registration_ids:
+            activity = reservation.activity_id
+            """print activity.name
+            print activity.places
+            print len(activity.activity_registration_ids)"""
+            if len(activity.activity_registration_ids) > activity.places and activity.queue_allowed:
+                #print("##vert##################")
+                warning_message = _('This activity : {} is already full, please'
+                                    ' remove your registration and register in'
+                                    ' the queue using the bellow button')
+                return {
+                    'warning' : {
+                        'title' : _('Warning'),
+                        'message': warning_message.format(activity.name),
+                    }
+                }
+                """
+
+            print "######################################"
+            print reservation.activity_id.places
+            print "######################################"
+            print reservation.activity_id.places_remain
 
         if len(self.activity_registration_ids) > self.places and self.queue_allowed:
             return {
@@ -31,7 +58,7 @@ class GolemMember(models.Model):
                     'title' : _('Warning'),
                     'message': _('No remaining place, please register in the queue'),
                 }
-            }
+            }"""
 
     def queue_register(self):
 
@@ -39,6 +66,7 @@ class GolemMember(models.Model):
             'name'      : _('Choose the activity to register in'),
             'type'      : 'ir.actions.act_window',
             'res_model' : 'golem.activity.queue.choose.wizard',
-            'view_mode': 'form',#'context' :{'default_activity_id' : activity_id.id},'domain' : [('activity_id.places_remain', '=', 0)],# activity_id.name)],#"('activity_id', '=', True)"'flags': {'action_buttons': True},
+            'view_mode': 'form',#'context' :{'default_activity_id' : activity_id.id},
+            'domain' : [('activity_id.places_remain', '=', 0)],# activity_id.name)],#"('activity_id', '=', True)"'flags': {'action_buttons': True},
             'target': 'new',
         }
diff --git a/golem_activity_queue/wizard/golem_activity_queue_choose_views.xml b/golem_activity_queue/wizard/golem_activity_queue_choose_views.xml
index bd88b01..e2882d2 100644
--- a/golem_activity_queue/wizard/golem_activity_queue_choose_views.xml
+++ b/golem_activity_queue/wizard/golem_activity_queue_choose_views.xml
@@ -27,10 +27,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       <field name="arch" type="xml">
         <form string="Rejection reason">
           <group>
-            <field name="activity_id"/>
+            <field name="activity_id" options="{'no_create': True}" />
           </group>
           <footer>
-            <button name="ChooseActivity" string="Choose Activity to register in" type="object"
+            <button name="ChooseActivity" string="Validate" type="object"
               class="oe_highlight" />
             <button string="Cancel" class="oe_link" special="cancel" />
           </footer>