Fix issue with password types