Fix some samples to use user id rather than email
Merge pull request #535 from markewallace/SampleFixes

Fix some samples to use user id rather than email