Add masked password fields
Add messages
Fix things