Fixed some users according to gitdm database

Closes bug 1212251

Change-Id: I625e6c64c29c8c494e847921b5bad4b993f963b8
Merge "Fixed some users according to gitdm database"