Question 492671
Yes, you are doing it right.  "will be when" happened in the past.