Handling selecting users with and without translations

Change-Id: Ia552e4c8376b1e3237c593a97429b6e7b406f55c