diff --git a/src/controller/messages.py b/src/controller/messages.py
index 840cb1f..3896384 100644
--- a/src/controller/messages.py
+++ b/src/controller/messages.py
@@ -47,9 +47,8 @@ class post(object):
 		if select.get_response() == widgetUtils.OK and select.users.GetCount() > 0:
 			self.tagged_people = []
 			tagged_users = select.get_all_users()
-			for i in friends["items"]:
-				if u"{0} {1}".format(i["first_name"], i["last_name"]) in tagged_users:
-					self.tagged_people.append(u"[id%s|%s]" % (str(i["id"]), i["first_name"]))
+			for i in tagged_users:
+				self.tagged_people.append(u"[id%s|%s]" % (str(friends["items"][i]["id"]), friends["items"][i]["first_name"]))
 			self.message.text.SetValue(self.message.text.GetValue()+ u", ".join(self.tagged_people))
 
 	def translate(self, *args, **kwargs):
diff --git a/src/wxUI/dialogs/selector.py b/src/wxUI/dialogs/selector.py
index 0edb02d..2aa31ff 100644
--- a/src/wxUI/dialogs/selector.py
+++ b/src/wxUI/dialogs/selector.py
@@ -35,6 +35,7 @@ class selectPeople(widgetUtils.BaseDialog):
 
 	def __init__(self, users=[]):
 		super(selectPeople, self).__init__(parent=None, title=_(u"Tag friends"))
+		self.indexes = []
 		self.users_list = users
 		panel = wx.Panel(self)
 		sizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -74,13 +75,12 @@ class selectPeople(widgetUtils.BaseDialog):
 		selection = self.get_user()
 		if selection in self.users_list:
 			self.users.Append(selection)
+			self.indexes.append(self.cb.GetSelection())
 
 	def remove_user(self, *args, **kwargs):
-		self.users.Delete(self.users.GetSelection())
+		n = self.users.GetSelection()
+		self.users.Delete(n)
+		self.indexes.remove(n)
 
 	def get_all_users(self):
-		users = []
-		for i in xrange(0, self.users.GetCount()):
-			self.users.Select(i)
-			users.append(self.users.GetStringSelection())
-		return users
\ No newline at end of file
+		return self.indexes
\ No newline at end of file