Actually change accounts correctly