diff --git a/src/frontend/app/administration/user/user-administration.component.ts b/src/frontend/app/administration/user/user-administration.component.ts
index 19c31254804923abcd42dc1b149de84106b791a6..d7ffcf6b157b47e12c16f77adb1232b6f2ba65e5 100755
--- a/src/frontend/app/administration/user/user-administration.component.ts
+++ b/src/frontend/app/administration/user/user-administration.component.ts
@@ -537,21 +537,22 @@ export class UserAdministrationComponent extends AutoCompletePlugin implements O
     toggleBasket(state:boolean) {
         let basketsDisable:any = [];
         this.user.baskets.forEach((elem: any) => {
-            if (this.selectionBaskets.selected.map((e:any) => { return e.basket_id; }).indexOf(elem.basket_id) != -1 && this.selectionBaskets.selected.map((e:any) => { return e.group_id; }).indexOf(elem.group_id) != -1 && elem.allowed != state) {
-                elem.allowed = state;
-                basketsDisable.push({"basketId" : elem.basket_id, "groupSerialId":elem.groupSerialId, "allowed":state});
-            }
+            this.selectionBaskets.selected.forEach((selected: any) => {
+                if (elem.basket_id == selected.basket_id && elem.group_id == selected.group_id && elem.allowed != state) {
+                    elem.allowed = state;
+                    basketsDisable.push({"basketId" : elem.basket_id, "groupSerialId":elem.groupSerialId, "allowed":state});
+                }
+            });
         });
         if (basketsDisable.length > 0) {
             this.http.put(this.coreUrl + "rest/users/" + this.serialId + "/baskets", {"baskets" :basketsDisable})
             .subscribe((data: any) => {
                 this.selectionBaskets.clear();
                 this.notify.success(this.lang.basketsUpdated);
-            }, (err) => {
+            }, (err: any) => {
                 this.notify.error(err.error.errors);
             });
         }
-        
     }
 
     activateAbsence() {