Added non-university email proper handling