Small changes to passwordstore