diff --git a/internal/entities/user.go b/internal/entities/user.go
index ef895a8..0754f05 100644
--- a/internal/entities/user.go
+++ b/internal/entities/user.go
@@ -56,11 +56,6 @@ func (u *User) RefreshPasscode(passcodeAttrIdx []int, customerAttributes Custome
 }
 
 func (u *User) GetLoginInterface() ([]int, error) {
-	err := u.Interface.LoginShuffle()
-
-	if err != nil {
-		return nil, err
-	}
 	return u.Interface.IdxInterface, nil
 }
 
diff --git a/internal/entities/user_interface.go b/internal/entities/user_interface.go
index 78f7377..3b2d966 100644
--- a/internal/entities/user_interface.go
+++ b/internal/entities/user_interface.go
@@ -157,8 +157,8 @@ func (u *UserInterface) LoginShuffle() error {
 	selectedSets := utils.NewSetFromSlice[int](setIdxs[:numbOfSelectedSets])
 
 	for keyIdx, key := range keypadSet1 {
-		for idx, attrIdx := range key {
-			if selectedSets.Contains(attrIdx) {
+		for idx := range key {
+			if selectedSets.Contains(idx) {
 				keypadSet1[keyIdx][idx] = keypadSet2[keyIdx][idx]
 			}
 		}