Fixed selected users issues