Need to fix some error with passwordr