diff --git a/main/group/group.php b/main/group/group.php
index 6a43269fa3..01228d8fe7 100644
--- a/main/group/group.php
+++ b/main/group/group.php
@@ -30,6 +30,7 @@ api_protect_course_script(true);
 
 $htmlHeadXtra[] = '<script>
 $(document).ready( function() {
+    var i;
 	for (i=0; i<$(".actions").length; i++) {
 		if ($(".actions:eq("+i+")").html()=="<table border=\"0\"></table>" || $(".actions:eq("+i+")").html()=="" || $(".actions:eq("+i+")").html()==null) {
 			$(".actions:eq("+i+")").hide();
diff --git a/main/group/group_creation.php b/main/group/group_creation.php
index dd475544a8..71a95f5af8 100644
--- a/main/group/group_creation.php
+++ b/main/group/group_creation.php
@@ -91,7 +91,7 @@ elseif (isset($_POST['number_of_groups'])) {
         $number_of_groups = intval($_POST['number_of_groups']);
         if ($number_of_groups > 1) {
     ?>
-    <script type="text/javascript">
+    <script>
     var number_of_groups = <?php echo $number_of_groups; ?>;
     function switch_state(key) {
         for( i=1; i<number_of_groups; i++) {
@@ -143,10 +143,12 @@ elseif (isset($_POST['number_of_groups'])) {
 		$element_template = <<<EOT
 	<tr>
 		<td>
-			<!-- BEGIN required --><span class="form_required">*</span> <!-- END required -->{label}
+			<!-- BEGIN required -->
+			<span class="form_required">*</span> <!-- END required -->{label}
 		</td>
 		<td>
-			<!-- BEGIN error --><span class="form_error">{error}</span><br /><!-- END error -->	{element}
+			<!-- BEGIN error -->
+			<span class="form_error">{error}</span><br /><!-- END error -->	{element}
 		</td>
 	</tr>
 
@@ -214,11 +216,9 @@ EOT;
         $create_groups_form = new FormValidator('create_groups', 'post', api_get_self().'?'.api_get_cidreq());
 		$create_groups_form->addElement('header', $nameTools);
 		$group_el = array ();
-		$group_el[] = $create_groups_form->createElement('static', null, null, get_lang('Create'));
-		$group_el[] = $create_groups_form->createElement('text', 'number_of_groups', null, array('class' => 'span1'));
-		$group_el[] = $create_groups_form->createElement('static', null, null, get_lang('NewGroups'));
+		$group_el[] = $create_groups_form->createElement('text', 'number_of_groups', array(get_lang('Create'), '1'));
 		$group_el[] = $create_groups_form->createElement('style_submit_button', 'submit', get_lang('ProceedToCreateGroup'), 'class="save"');
-		$create_groups_form->addGroup($group_el, 'create_groups', null, ' ', false);
+		$create_groups_form->addGroup($group_el, 'create_groups', get_lang('NumberOfGroupsToCreate'), ' ', false);
 		$defaults = array();
 		$defaults['number_of_groups'] = 1;
 		$create_groups_form->setDefaults($defaults);
diff --git a/main/group/member_settings.php b/main/group/member_settings.php
index f49aa63a3c..6a409841c2 100644
--- a/main/group/member_settings.php
+++ b/main/group/member_settings.php
@@ -116,22 +116,24 @@ $form = new FormValidator('group_edit', 'post', api_get_self().'?'.api_get_cidre
 $form->addElement('hidden', 'action');
 $form->addElement('hidden', 'max_student', $current_group['max_student']);
 $complete_user_list = GroupManager::fill_groups_list($current_group['id']);
-usort($complete_user_list, 'sort_users');
+
+$possible_users = array();
+if (!empty($complete_user_list)) {
+    usort($complete_user_list, 'sort_users');
+    foreach ($complete_user_list as $index => $user) {
+        $possible_users[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')';
+    }
+}
 
 // Group members
 $group_member_list = GroupManager::get_subscribed_users($current_group['id']);
 
 $selected_users = array ();
-foreach ($group_member_list as $index => $user) {
-    $selected_users[] = $user['user_id'];
-}
-
-// possible : number_groups_left > 0 and is group member
-$possible_users = array();
-foreach ($complete_user_list as $index => $user) {
-    $possible_users[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')';
+if (!empty($group_member_list)) {
+    foreach ($group_member_list as $index => $user) {
+        $selected_users[] = $user['user_id'];
+    }
 }
-
 $group_members_element = $form->addElement('advmultiselect', 'group_members', get_lang('GroupMembers'), $possible_users, 'style="width: 280px;"');
 
 $group_members_element->setElementTemplate('
diff --git a/main/group/tutor_settings.php b/main/group/tutor_settings.php
index e31bd78c13..eb7d8fd59a 100644
--- a/main/group/tutor_settings.php
+++ b/main/group/tutor_settings.php
@@ -110,11 +110,13 @@ foreach ($group_tutor_list as $index => $user) {
 }
 
 $complete_user_list = GroupManager :: fill_groups_list($current_group['id']);
-usort($complete_user_list, 'sort_users');
-
 $possible_users = array();
-foreach ($complete_user_list as $index => $user) {
-    $possible_users[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')';
+if (!empty($complete_user_list)) {
+    usort($complete_user_list, 'sort_users');
+
+    foreach ($complete_user_list as $index => $user) {
+        $possible_users[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')';
+    }
 }
 
 $group_tutors_element = $form->addElement('advmultiselect', 'group_tutors', get_lang('GroupTutors'), $possible_users, 'style="width: 280px;"');
diff --git a/main/inc/lib/groupmanager.lib.php b/main/inc/lib/groupmanager.lib.php
index 094f316c38..e2f8c788ae 100644
--- a/main/inc/lib/groupmanager.lib.php
+++ b/main/inc/lib/groupmanager.lib.php
@@ -389,8 +389,9 @@ class GroupManager
                     $i--;
                 }
             }
-            if (count($group_ids)==0)
+            if (count($group_ids) == 0) {
                 return 0;
+            }
         }
 
         // Unsubscribe all users
@@ -443,7 +444,6 @@ class GroupManager
             return null;
         }
 
-
         $table_group = Database :: get_course_table(TABLE_GROUP);
         $sql = "SELECT * FROM $table_group WHERE c_id = $course_id AND id = ".intval($group_id);
         $db_result = Database::query($sql);
@@ -893,7 +893,9 @@ class GroupManager
         $group_table = Database :: get_course_table(TABLE_GROUP);
         $group_user_table = Database :: get_course_table(TABLE_GROUP_USER);
         $sql = 'SELECT COUNT(gu.group_id) AS current_max FROM '.$group_user_table.' gu, '.$group_table.' g
-                WHERE g.c_id = '.$course_info['real_id'].' AND gu.group_id = g.id ';
+				WHERE g.c_id = '.$course_info['real_id'].'
+				AND gu.c_id = g.c_id 
+				AND gu.group_id = g.id ';
         if ($category_id != null) {
             $category_id = Database::escape_string($category_id);
             $sql .= ' AND g.category_id = '.$category_id;