improved behaviour of choice email fields