Make user_list more generic.

So we don't need to duplicate code.

Change-Id: I422aa54e9ebd33a71159ad68f5ae0e0cdf017357