SSP-1536 Minor security and filtering change for Student email