Fixes #22 - admin becoming owner on edit, #23 - owner block displayed twice