The TFSA has specific rules regarding stocks and transfers thereof. In your case which you described, a deemed disposition has occurred according to the TFSA rules and reg's..

As everyone's situation is unique in some way, you may want to revisit this topic with your accountant again. I deal with KPMG and if this is not correct, please advise myself and the board. Nothing better than catching your accountants off guard!!

cheers...fast