admin bugfix
Fix errors caused by non logged in users
Merge branch 'release/1.2-moorfields' into release/1.3-moorfields