Added e-mail and password verification