(Bug 4981) Move confirmation to earlier in the process
Merge pull request #512 from afuna/bug4981-move-confirm

(Bug 4981) Move confirmation to earlier in the process