Account temporary fix