Keep AccountManagerFrame in 1.6