diff --git a/manager/module/machineDefault.php b/manager/module/machineDefault.php
index ae186a6..c1e80d4 100755
--- a/manager/module/machineDefault.php
+++ b/manager/module/machineDefault.php
@@ -74,11 +74,10 @@
 			extract($params);
 
 			/* Creation de l'association */
-			$link_machine = new Repo('cluster/link', [
+			$link_machine = new Repo('machine_cluster/link', [
 				$_SESSION['WAREHOUSE']['id'],
 				$id_cluster,
-				$id_machine,
-				clusterRepo::MACHINE_CLASS
+				$id_machine
 			]);
 
 			/* (1) On retourne l'erreur du repo */
@@ -105,7 +104,7 @@
 			$link_machine = new Repo('machine_cluster/unlink', [
 				$_SESSION['WAREHOUSE']['id'],
 				$id_cluster,
-				$id_machine,
+				$id_machine
 			]);
 
 			/* (1) On retourne l'erreur du repo */
diff --git a/manager/module/userDefault.php b/manager/module/userDefault.php
index ad38170..95af76b 100755
--- a/manager/module/userDefault.php
+++ b/manager/module/userDefault.php
@@ -95,8 +95,7 @@
 			$link_user = new Repo('user_cluster/link', [
 				$_SESSION['WAREHOUSE']['id'],
 				$id_cluster,
-				$id_user,
-				clusterRepo::USER_CLASS
+				$id_user
 			]);
 
 			/* (1) On retourne l'erreur du repo */
diff --git a/manager/view/group/groupChoice.php b/manager/view/group/groupChoice.php
index 2c34c14..57a4c73 100644
--- a/manager/view/group/groupChoice.php
+++ b/manager/view/group/groupChoice.php
@@ -13,7 +13,7 @@
 
 			switch($type){
 				case 'clusterlist': return "
-						<option value='@id_cluster'>@name (@type)</option>";
+						<option value='@prefix@id_cluster'>@name (@type)</option>";
 						break;
 
 
@@ -39,36 +39,71 @@
 
 
 
-			/* [1] On récupére tous les groupes
+			/* [1] On récupére tous les groupes utilisateur
 			=========================================================*/
 			/* (1) On récupère les groupe */
-			$getClustersRequest  = new ModuleRequest('clusterDefault/getAll');
-			$getClustersResponse = $getClustersRequest->dispatch();
+			$getUserClustersReq  = new ModuleRequest('clusterDefault/getAll', [
+				'class' => 0
+			]);
+			$getUserClusters = $getUserClustersReq->dispatch();
 
 			/* (2) Si on ne le trouve pas, on retourne une erreur */
-			if( $getClustersResponse->error != ManagerError::Success )
+			if( $getUserClusters->error != ManagerError::Success )
 				return View::$htmlError;
 
 			/* (3) On récupère les données du groupe */
-			$CLUSTERLIST = $getClustersResponse->get('clusters');
+			$USERCLUSTERS = $getUserClusters->get('clusters');
 
-			/* (4) On ajoute le type de groupe textuel */
-			foreach($CLUSTERLIST as $c=>$cluster)
-				$CLUSTERLIST[$c]['type'] = ($cluster['class']==clusterRepo::USER_CLASS) ? 'utilisateurs' : 'machines';
+			/* (4) On ajoute les données */
+			foreach($USERCLUSTERS as $c=>$cluster)
+				$USERCLUSTERS[$c]['id_cluster'] = $cluster['id_user_cluster'];
 
-
-			/* [2] On construit la vue des groupes
-			=========================================================*/
-			$cluster_view = View::replaceMultiple(
+			/* (5) On construit la vue */
+			$user_view = View::replaceMultiple(
 				self::template('clusterlist'),
-				$CLUSTERLIST
+				$USERCLUSTERS,
+				[
+					'prefix' => 'u',
+					'type'   => 'utilisateur'
+				]
 			);
 
 
+			/* [2] On récupére tous les groupes machine
+			=========================================================*/
+			/* (1) On récupère les groupe */
+			$getMachineClustersReq  = new ModuleRequest('clusterDefault/getAll', [
+				'class' => 1
+			]);
+			$getMachineClusters = $getMachineClustersReq->dispatch();
 
+			/* (2) Si on ne le trouve pas, on retourne une erreur */
+			if( $getMachineClusters->error != ManagerError::Success )
+				return View::$htmlError;
+
+			/* (3) On récupère les données du groupe */
+			$MACHINECLUSTERS = $getMachineClusters->get('clusters');
+
+			/* (4) On ajoute les données */
+			foreach($MACHINECLUSTERS as $c=>$cluster)
+				$MACHINECLUSTERS[$c]['id_cluster'] = $cluster['id_machine_cluster'];
+
+			/* (5) On construit la vue */
+			$machine_view = View::replaceMultiple(
+				self::template('clusterlist'),
+				$MACHINECLUSTERS,
+				[
+					'prefix' => 'm',
+					'type'   => 'machine'
+				]
+			);
+
+
+			/* [3] On renvoie la vue globale
+			=========================================================*/
 			return View::replaceSingle(
 				self::template(), [
-					'clusters' => $cluster_view
+					'clusters' => $user_view.$machine_view
 				]
 			);
 		}
diff --git a/manager/view/group/membersChoice.php b/manager/view/group/membersChoice.php
index 02a4e76..586f310 100644
--- a/manager/view/group/membersChoice.php
+++ b/manager/view/group/membersChoice.php
@@ -43,9 +43,10 @@
 
 
 				default: return "
+					<a style='text-align:center; color: #000;' href='/groups/members/'>Changer de groupe</a><p></p>
 					<article class='check-table'>
-						<input type='hidden' id='filter-member-idcluster' value='@id_cluster'>
-						<input type='hidden' id='filter-member-class' value='@class'>
+						<input type='hidden' id='members-member-idcluster' value='@id_cluster'>
+						<input type='hidden' id='members-member-class' value='@class'>
 
 						<div>
 							<span><strong>@name</strong></span>
diff --git a/view/js/groups-min.js b/view/js/groups-min.js
index f10d5a2..a7826fd 100644
--- a/view/js/groups-min.js
+++ b/view/js/groups-min.js
@@ -1,7 +1,7 @@
 var section={view:{text:'#CONTAINER > section[data-sublink="view"] ',element:document.querySelector('#CONTAINER > section[data-sublink="view"]'),searchbar:document.querySelector('#CONTAINER > section[data-sublink="view"] > .searchbar')},create:{text:'#CONTAINER > section[data-sublink="create"] ',element:document.querySelector('#CONTAINER > section[data-sublink="create"]')},remove:{text:'#CONTAINER > section[data-sublink="remove"] ',element:document.querySelector('#CONTAINER > section[data-sublink="remove"]')},
 edit:{text:'#CONTAINER > section[data-sublink="edit"] ',element:document.querySelector('#CONTAINER > section[data-sublink="edit"]')},members:{text:'#CONTAINER > section[data-sublink="members"] ',element:document.querySelector('#CONTAINER > section[data-sublink="members"]'),chooser:{text:'#CONTAINER > section[data-sublink="members"] form#choose-cluster ',element:document.querySelector('#CONTAINER > section[data-sublink="members"] form#choose-cluster')}},permissions:{text:'#CONTAINER > section[data-sublink="permissions"] ',
 element:document.querySelector('#CONTAINER > section[data-sublink="permissions"]')}};
-if(null!=section.view.element){1<pageManager.vars.length&&/^[um]\d+$/.test(pageManager.vars[1])&&(document.location="#"+pageManager.vars[1],document.getElementById(pageManager.vars[1]).addClass("selected"));section.view.link={edit:document.querySelectorAll(section.view.text+".link_edit[data-cluster]"),remove:document.querySelectorAll(section.view.text+".link_remove[data-cluster]")};section.view.group={rem:document.querySelectorAll(section.view.text+".rem-member[data-cluster][data-member]"),add:document.querySelectorAll(section.view.text+
+if(null!=section.view.element){1<pageManager.vars.length&&/^(u|m)\d+$/.test(pageManager.vars[1])&&(document.location="#"+pageManager.vars[1],document.getElementById(pageManager.vars[1]).addClass("selected"));section.view.link={edit:document.querySelectorAll(section.view.text+".link_edit[data-cluster]"),remove:document.querySelectorAll(section.view.text+".link_remove[data-cluster]")};section.view.group={rem:document.querySelectorAll(section.view.text+".rem-member[data-cluster][data-member]"),add:document.querySelectorAll(section.view.text+
 ".add-member[data-cluster]")};section.view.searchbar.addEventListener("keyup",function(a){api.send({path:"clusterDefault/search",keywords:section.view.searchbar.value},function(a){if(0==a.ModuleError){for(var d=[],c=0;c<a.clusters.length;c++)d.push(a.clusters[c].id_cluster);a=document.querySelectorAll(section.view.text+"> article.inline-box[id]");for(c=0;c<a.length;c++)-1<d.indexOf(a[c].id)?a[c].remClass("hidden"):a[c].addClass("hidden")}})},!1);var i;for(i=0;i<section.view.link.edit.length;i++)section.view.link.edit[i].addEventListener("click",
 function(a){pageManager.vars[1]=a.target.getData("cluster");autofill_edit();navSubMenu("edit")},!1);for(i=0;i<section.view.link.remove.length;i++)section.view.link.remove[i].addEventListener("click",function(a){pageManager.vars[1]=a.target.getData("cluster");autofill_remove();navSubMenu("remove")},!1);for(i=0;i<section.view.group.rem.length;i++)section.view.group.rem[i].addEventListener("click",function(a){var b=a.target.getData("cluster")[0],d=a.target.getData("cluster").slice(1);console.log(a.target);
 var c={};c.path="u"==b?"userDefault/unlink":"machineDefault/unlink";c.id_cluster=d;"u"==b?c.id_user=a.target.getData("member"):c.id_machine=a.target.getData("member");api.send(c,function(b){if(0!=b.ModuleError)return!1;a.target.parentNode.parentNode.removeChild(a.target.parentNode)})},!1);for(i=0;i<section.view.group.add.length;i++)section.view.group.add[i].addEventListener("click",function(a){pageManager.vars[1]=a.target.getData("cluster");navSubMenu("members");document.location=""},!1)}
@@ -10,7 +10,7 @@ section.create.input.submit.anim("active",1500))})},!1));
 if(null!=section.remove.element){var autofill_remove=function(){var a={id_cluster:"","class":"",name:"",disable_input:!0};if(null==found_remove[searchindex_remove])searchindex_remove=section.remove.input.search.num.innerHTML=0;else{var b;found_remove[searchindex_remove].hasOwnProperty("id_user_cluster")?(a=found_remove[searchindex_remove].id_user_cluster,b=0):(a=found_remove[searchindex_remove].id_machine_cluster,b=1);a={id_cluster:a,"class":b,name:found_remove[searchindex_remove].name,disable_input:!1};
 section.remove.input.search.num.innerHTML=searchindex_remove+1}section.remove.input.search.id.value=a.id_cluster;section.remove.input.name.value=a.name;section.remove.input["class"].value=0==a["class"]?"utilisateur":"machine";console.log(a);section.remove.input.submit.disabled=a.disable_input};section.remove.input={search:{view:document.querySelector(section.remove.text+".remove_search_view"),num:document.querySelector(section.remove.text+".remove_search_num"),sum:document.querySelector(section.remove.text+
 ".remove_search_sum"),keyword:document.querySelector(section.remove.text+"#remove_search_keyword"),id:document.querySelector(section.remove.text+"#remove_search_id"),submit:document.querySelector(section.remove.text+"#remove_search_submit")},name:document.querySelector(section.remove.text+"#remove_name"),"class":document.querySelector(section.remove.text+"#remove_class"),submit:document.querySelector(section.remove.text+"#remove_submit")};var lastkeywords_remove="",found_remove=[],searchindex_remove=
-0;if(2<=pageManager.vars.length&&/^[um]\d+$/.test(pageManager.vars[1])){var prefix=pageManager.vars[1][0],cluster=pageManager.vars[1].slice(1),request={path:"clusterDefault/getById",id_cluster:cluster,"class":"u"==prefix?0:1};api.send(request,function(a){0==a.ModuleError&&(found_remove=[a.cluster],searchindex_remove=0,autofill_remove())})}section.remove.input.search.submit.addEventListener("click",function(a){a.preventDefault();if(""!=section.remove.input.search.keyword.value)if(section.remove.input.search.keyword.value==
+0;if(2<=pageManager.vars.length&&/^(u|m)\d+$/.test(pageManager.vars[1])){var prefix=pageManager.vars[1][0],cluster=pageManager.vars[1].slice(1),request={path:"clusterDefault/getById",id_cluster:cluster,"class":"u"==prefix?0:1};api.send(request,function(a){0==a.ModuleError&&(found_remove=[a.cluster],searchindex_remove=0,autofill_remove())})}section.remove.input.search.submit.addEventListener("click",function(a){a.preventDefault();if(""!=section.remove.input.search.keyword.value)if(section.remove.input.search.keyword.value==
 lastkeywords_remove)searchindex_remove=(searchindex_remove+1)%found_remove.length,autofill_remove();else{var b={path:"clusterDefault/search",keywords:section.remove.input.search.keyword.value};api.send(b,function(a){0==a.ModuleError&&(section.remove.input.search.submit.anim("active",1E3),searchindex_remove=0,found_remove=a.clusters,section.remove.input.search.sum.innerHTML=found_remove.length,autofill_remove());lastkeywords_remove=b.keywords})}},!1);section.remove.input.submit.addEventListener("click",
 function(a){a.preventDefault();""!=section.remove.input.search.id.value&&api.send({path:"clusterDefault/delete",id_cluster:section.remove.input.search.id.value},function(a){0==a.ModuleError&&1==a.status?(console.log("Groupe supprimee!"),section.remove.input.submit.anim("active",1500),autofill_remove(null)):console.error("ModuleError::"+a.ModuleError)})},!1)}
 if(null!=section.edit.element){var autofill_edit=function(){var a="",b="",d=!0;null==found_edit[searchindex_edit]?searchindex_edit=section.edit.input.search.num.innerHTML=0:(a=found_edit[searchindex_edit].id_cluster,b=found_edit[searchindex_edit].name,d=!1,section.edit.input.search.num.innerHTML=searchindex_edit+1);section.edit.input.search.id.value=a;section.edit.input.name.value=b;section.edit.input.submit.disabled=d};section.edit.input={search:{view:document.querySelector(section.edit.text+".edit_search_view"),
@@ -18,7 +18,8 @@ num:document.querySelector(section.edit.text+".edit_search_num"),sum:document.qu
 searchindex_edit=0;2<=pageManager.vars.length&&!isNaN(pageManager.vars[1])&&api.send({path:"clusterDefault/getById",id_cluster:pageManager.vars[1]},function(a){0==a.ModuleError&&(found_edit=[a.cluster],searchindex_edit=0,autofill_edit())});section.edit.input.search.submit.addEventListener("click",function(a){a.preventDefault();if(""!=section.edit.input.search.keyword.value)if(section.edit.input.search.keyword.value==lastkeywords_edit)searchindex_edit=(searchindex_edit+1)%found_edit.length,autofill_edit();
 else{var b={path:"clusterDefault/search",keywords:section.edit.input.search.keyword.value};api.send(b,function(a){0==a.ModuleError&&(section.edit.input.search.submit.anim("active",1E3),searchindex_edit=0,found_edit=a.clusters,section.edit.input.search.sum.innerHTML=found_edit.length,autofill_edit());lastkeywords_edit=b.keywords})}},!1);section.edit.input.submit.addEventListener("click",function(a){a.preventDefault();""!=section.edit.input.search.id.value&&api.send({path:"clusterDefault/edit",id_cluster:section.edit.input.search.id.value,
 name:section.edit.input.name.value},function(a){0==a.ModuleError&&1==a.status?(console.log("Groupe modifiee!"),section.edit.input.submit.anim("active",1500),autofill_edit(section.edit.input.search.id.value)):console.error("ModuleError::"+a.ModuleError)})},!1)}
-null!=section.members.element&&null!=section.members.chooser.element&&(section.members.chooser.deflater=new FormDeflater(section.members.chooser.element,["select"],["data-name"]),section.members.chooser.submit=document.querySelector(section.members.chooser.text+"#choose-cluster"),section.members.chooser.submit.addEventListener("click",function(a){a.preventDefault();a=section.members.chooser.deflater.deflate().cluster;isNaN(a)||(pageManager.vars[1]=a,pageManager.refresh(),document.location="")},!1));
-null!=section.members.element&&null==section.members.chooser.element&&(section.members.deflater=new FormDeflater(section.members.element,["input"],["data-name"]),section.members.baseData=section.members.deflater.deflate().members,section.members["class"]=document.querySelector("#members-member-class").value,section.members.idcluster=document.querySelector("#members-member-idcluster").value,section.members.element.addEventListener("click",function(a){var b=[],d=[],c=section.members.deflater.deflate().members;
-c instanceof Array||(c=[c]);for(a=0;a<c.length;a++)-1==section.members.baseData.indexOf(c[a])&&b.push(c[a]);for(a=0;a<section.members.baseData.length;a++)-1==c.indexOf(section.members.baseData[a])&&d.push(section.members.baseData[a]);for(a=0;a<b.length;a++){var e={};e.path=0==section.members["class"]?"userDefault/link":"machineDefault/link";e.id_cluster=section.members.idcluster;0==section.members["class"]?e.id_user=b[a]:e.id_machine=b[a];api.send(e,function(a){0!=a.ModuleError&&console.error("Erreur d'ajout de membre")})}for(a=
+null!=section.members.element&&null!=section.members.chooser.element&&(section.members.chooser.deflater=new FormDeflater(section.members.chooser.element,["select"],["data-name"]),section.members.chooser.submit=document.querySelector(section.members.chooser.text+"#choose-cluster"),section.members.chooser.submit.addEventListener("click",function(a){a.preventDefault();a=section.members.chooser.deflater.deflate().cluster;/^(u|m)\d+$/.test(a)&&(pageManager.vars[1]=a,pageManager.refresh(),document.location=
+"")},!1));
+null!=section.members.element&&null==section.members.chooser.element&&(section.members.deflater=new FormDeflater(section.members.element,["input"],["data-name"]),section.members.baseData=section.members.deflater.deflate().members,section.members["class"]=document.querySelector("#members-member-class").value,section.members.idcluster=document.querySelector("#members-member-idcluster").value,section.members.element.addEventListener("click",function(a){var b=[],d=[],c=section.members.deflater.deflate().members;c instanceof
+Array||(c=[c]);for(a=0;a<c.length;a++)-1==section.members.baseData.indexOf(c[a])&&b.push(c[a]);for(a=0;a<section.members.baseData.length;a++)-1==c.indexOf(section.members.baseData[a])&&d.push(section.members.baseData[a]);for(a=0;a<b.length;a++){var e={};e.path=0==section.members["class"]?"userDefault/link":"machineDefault/link";e.id_cluster=section.members.idcluster;0==section.members["class"]?e.id_user=b[a]:e.id_machine=b[a];api.send(e,function(a){0!=a.ModuleError&&console.error("Erreur d'ajout de membre")})}for(a=
 0;a<d.length;a++)b={},b.path=0==section.members["class"]?"userDefault/unlink":"machineDefault/unlink",b.id_cluster=section.members.idcluster,0==section.members["class"]?b.id_user=d[a]:b.id_machine=d[a],api.send(b,function(a){0!=a.ModuleError&&console.error("Erreur d'ajout de membre")});section.members.baseData=c},!1));
diff --git a/view/js/groups.js b/view/js/groups.js
index 6384b14..484e9b4 100644
--- a/view/js/groups.js
+++ b/view/js/groups.js
@@ -45,7 +45,7 @@ var section = {
 if( section.view.element != null ){
 
 	/* (0) On gère le zoom sur un utilisateur via URL */
-	if( pageManager.vars.length > 1 && /^[um]\d+$/.test(pageManager.vars[1]) ){
+	if( pageManager.vars.length > 1 && /^(u|m)\d+$/.test(pageManager.vars[1]) ){
 		document.location = '#'+pageManager.vars[1];
 		document.getElementById(pageManager.vars[1]).addClass('selected');
 	}
@@ -328,7 +328,7 @@ if( section.remove.element != null ){
 	}
 
 	// Gestion automatique au chargement de la page si ID_CLUSTER dans url "/users/remove/:id_cluster:"
-	if( pageManager.vars.length >= 2 && /^[um]\d+$/.test(pageManager.vars[1]) ){
+	if( pageManager.vars.length >= 2 && /^(u|m)\d+$/.test(pageManager.vars[1]) ){
 		var prefix  = pageManager.vars[1][0];
 		var cluster = pageManager.vars[1].slice(1);
 
@@ -681,7 +681,7 @@ if( section.members.element != null && section.members.chooser.element != null )
 		var data = section.members.chooser.deflater.deflate()['cluster'];
 
 		// Vérification du type
-		if( isNaN(data) )
+		if( !/^(u|m)\d+$/.test(data) )
 			return;
 
 		/* (2) Redirection */