diff --git a/suivi_unit.php b/suivi_unit.php
index 5da7aaaf441431c5b8baf24d47d41d25ca124dfb..bfa48e867e34060f2e5b46e75ac480fae66e19bc 100644
--- a/suivi_unit.php
+++ b/suivi_unit.php
@@ -85,6 +85,7 @@ function get_groups($context, $active_group_id, $progress, $groups){
 
 			$group->selected='selected';
 		}
+		/*
 		foreach ($current_user_groups_ids as $ugi) {
 			if ( $group->id == $ugi ) {
 				$current_user_groups[] = $group;
@@ -92,8 +93,14 @@ function get_groups($context, $active_group_id, $progress, $groups){
 			else{
 				$other_groups[]=$group;
 			}
+		}*/
+		if ( in_array($group->id, $current_user_groups_ids)){
+			$current_user_groups[] = $group;
 		}
-	}
+		else{
+			$other_groups[]=$group;
+		}
+}
 
 	//Réservé pour l'export ?
 	/*if ( $active_group_id == 0 ) {
@@ -437,7 +444,6 @@ else {
 	if(isset($groups_all->current_user_groups) && !empty($groups_all->current_user_groups)){
 		$current_user_groups=$groups_all->current_user_groups;
 	}
-
 	$groups=$groups_all->groups;
 	$sections=get_sections($active_section_id);
 	$data=set_filters($data, $filters, $symbols, $sections, $groups, $current_user_groups, $active_group_name, $active_section_id);