Repair some Password bug