diff --git a/setup/so-functions b/setup/so-functions
index c097ec603..bb1db565a 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -2332,9 +2332,9 @@ verify_setup() {
 	result=$?
 	set +o pipefail
 	if [[ $result -eq 0 ]]; then
-		whiptail_setup_complete
-                # Remove ISO sudoers entry
+		# Remove ISO sudoers entry if present
                 sed -i '/so-setup/d' /etc/sudoers
+		whiptail_setup_complete
 	else
 		whiptail_setup_failed
 	fi