#6 #8 Fix admin email status