Fixed issue of defaults not  being password correctly