Auto set up calendar on add fix