Fix email's container
Fix password's match expression