diff --git a/openpermissions/lua/openpermissions/cl.lua b/openpermissions/lua/openpermissions/cl.lua
index 7d4555c..39d47bc 100644
--- a/openpermissions/lua/openpermissions/cl.lua
+++ b/openpermissions/lua/openpermissions/cl.lua
@@ -584,13 +584,13 @@ function OpenPermissions:OpenMenu(specific_addon)
 						end
 					else
 						local teams = {}
-						for i,t in ipairs(team.GetAllTeams()) do
+						for i,t in pairs(team.GetAllTeams()) do
 							table.insert(teams, {Name = t.Name, Index = i, Color = t.Color})
 						end
 						table.SortByMember(teams, "Name", true)
 						for i,item in ipairs(teams) do
 							DMenuOption_ColorIcon(ACCESS_GROUP_TEAM:AddOption(item.Name, function()
-								AddAccessGroup:Add(OpenPermissions.ACCESS_GROUP.TEAM, item.Name, OpenPermissions:GetTeamIdentifier(i))
+								AddAccessGroup:Add(OpenPermissions.ACCESS_GROUP.TEAM, item.Name, OpenPermissions:GetTeamIdentifier(item.Index))
 							end), item.Color)
 						end
 					end
@@ -986,4 +986,4 @@ end)
 
 net.Receive("OpenPermissions.NotAnAddon", function()
 	OpenPermissions:ChatPrint(L"not_an_addon", "[ERROR]", OpenPermissions.COLOR_RED)
-end)
\ No newline at end of file
+end)
diff --git a/openpermissions/lua/openpermissions/sh.lua b/openpermissions/lua/openpermissions/sh.lua
index 8655541..ec41162 100644
--- a/openpermissions/lua/openpermissions/sh.lua
+++ b/openpermissions/lua/openpermissions/sh.lua
@@ -517,7 +517,7 @@ function OpenPermissions:GetTeamFromIdentifier(team_identifier)
 			end
 		end
 	else
-		for i,t in ipairs(team.GetAllTeams()) do
+		for i,t in pairs(team.GetAllTeams()) do
 			if (t.Name == team_identifier) then
 				team_identifier_index[team_identifier] = i
 				return i
@@ -685,4 +685,4 @@ else
 			net.SendToServer()
 		end)
 	end
-end
\ No newline at end of file
+end