diff --git a/src/frontend/app/profile.component.ts b/src/frontend/app/profile.component.ts
index a2cd5dedfac1c126bb26f65fd083128bc5c806ac..01676cc1b5035da06bf00b26422ba9971b8814b7 100755
--- a/src/frontend/app/profile.component.ts
+++ b/src/frontend/app/profile.component.ts
@@ -86,7 +86,9 @@ export class ProfileComponent extends AutoCompletePlugin implements OnInit {
     masterToggleBaskets(event: any) {
         if (event.checked) {  
             this.user.baskets.forEach((basket: any) => {
-                this.selectionBaskets.select(basket);   
+                if ( !basket.userToDisplay) {
+                    this.selectionBaskets.select(basket);
+                }
             });
         } else {
             this.selectionBaskets.clear();
@@ -509,18 +511,18 @@ export class ProfileComponent extends AutoCompletePlugin implements OnInit {
 
     addBasketRedirection(newUser: any) {
         let basketsRedirect: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) {
-                basketsRedirect.push(
-                    {
-                        actual_user_id: newUser.serialId,
-                        basket_id:elem.basket_id,
-                        group_id:elem.groupSerialId,
-                        originalOwner: null
-                    }
-                )
-            }
+
+        this.selectionBaskets.selected.forEach((elem: any) => {
+            basketsRedirect.push(
+                {
+                    actual_user_id: newUser.serialId,
+                    basket_id:elem.basket_id,
+                    group_id:elem.groupSerialId,
+                    originalOwner: null
+                }
+            )
         });
+
         let r = confirm(this.lang.confirmAction + ' ' + this.lang.redirectBasket);
 
         if (r) {