4.0.4 update - lost email settings



Just bought a Samsung Galaxy S2 a couple of weeks ago. Took me ages to get my email set up on it.
Anyway tonight I had notification of a software update so did it - it updated to Andriod 4.0.4, but when I went back on email my account had disappeared and whenever I try to set up again it just times out after I've put email address and password in.
Any ideas?