Removed independent users which could be resolved automatically

Fixes bug 1208824

Change-Id: I0f43f228046b82f9688c4b31b2e14f3680d8c364
Merge "Removed independent users which could be resolved automatically"