fixed up passwd handling