Be careful with time clauses and if clauses in English. We do not use the Simple Future (Will Future) to talk about future events; we use the Present Simple instead. The time clauses are introduced by conjunctions: before, after, as soon as, until, till, when, whenever, while.