User sync issues

More commits that I forgot earlier.