Issue #64 - move submitterName and deviceIdentifier code to before first save