(CE-18) Fix blocked users being redirected to login page

Blocked users are being redirected to the login page rather than
being shown the blocked message when trying to edit a page.
Merge branch 'CE-18' into dev