Fix password management