I went through this with the check engine light for the same issue. You need to do two things: shut the car off completely when refueling and turn the gas cap past the clicking noise till it stops when done.
Thanks! Your Dad is obviously a very smart guy and just made me feel like one for buying my Supra! I am glad his expertise confirms what a fabulous car it truly is. I just love mine and wish I didn't have to keep it in the garage for winter hibernation.
Why must you charge the battery? I start mine up every week and go for a quick spin around the neighborhood and let it run for 10 minutes or so. Is that not enough?