Fix account saving