Changed so IDs are set on the server which fixes bad things