Merge "updated encrypted passwords with config"