More account activity fixes