Fix account location saving