Form and rules
How it works
After when, before, after, as soon as, once, until and by the time, do not normally use will in the time clause.
Use present simple for a future event: I'll call when I arrive.
Use present perfect when completion is important: I'll call when I've finished.
The main clause can use will, an imperative or another suitable future/modal form.
Until focuses on continuation up to a point; by the time often emphasizes that another action will already be complete at that point.