[FIX] Account change in drawer