Fixes issue preventing anyone from seeing edit page
Merge branch 'bug/starfruit'