Merge pull request #1548 from Spuds/other

Various fixes
! remove admin option to show emails, just leave them hidden

Signed-off-by: Spuds <spuds@spudsdesign.com>