cleanup, remove additional early return
fix duplicate count of installation

even in "optional identification"-mode set the "validated"
flag only once the use either did identify himself or skipped
it.