Fixed bugs for Account Section