Fixing some issues due to accounts creation year