ticket:5 fix email picker