Deal with salt in from param
Convert owner to id
Merge branch 'beta'