Added email and confirmation fields