Fixes duplicate users in database issue.

Change-Id: I3d8ccf67f69ac58a0792ee8656907906349e5a0a