Fix password hanging