Feature/iteration 6 dev fix double press on email.

Fixes issue #230