ui fix/email fix