emphasize user ownership (rebased from develop)

--rebased-from #783