Add better handling of passwords.