Update for ID-45 deal with special cases of old accounts