#630 Organization admin page template tweaks

Fixes #630