repair password handling