Account section fix