Improved multi account capabilities