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