(Bug 4981) Move confirmation to earlier in the process