lock down guard, resolves local development issue
generate dataset before save rather than not at all
assign user doesn't create a dataset
Merge pull request #629 from theodi/fix-578

Fix 578