Add admin controls, fix email type