continuing work on merging admin email