Made the password component better
merger fix