Fix accounts setup