Update user accounts to be keyed by FxA uid upon FxA login (bug 1024044)

should we just remove this?