updated with password config option