Fix account input bugs