Functionality works. Need to work on e-mail validation