Bugfixes

- Fixed bug where user was not correctly selected & loaded into main
editor on master page