newly created passwords are now encrypted
merged conflicts