diff --git a/setup/so-functions b/setup/so-functions
index c808cc6b2..30ccc2761 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1537,6 +1537,10 @@ install_cleanup() {
 		info "Removing so-setup permission entry from sudoers file"
 		sed -i '/so-setup/d' /etc/sudoers
 	fi
+
+	if [[ -z $SO_ERROR ]]; then
+		echo "Setup completed at $(date)" >> "$setup_log" 2>&1
+	fi
 }
 
 import_registry_docker() {
diff --git a/setup/so-setup b/setup/so-setup
index 998bdbe05..d050b80ff 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -935,7 +935,6 @@ if [[ -n $SO_ERROR ]]; then
 
 	SKIP_REBOOT=1
 	whiptail_setup_failed
-
 else 
 	echo "Successfully completed setup! Continuing with post-installation steps" >> $setup_log 2>&1
 	{
@@ -965,9 +964,9 @@ else
 
 	} | whiptail_gauge_post_setup "Running post-installation steps..."
 
+	echo "Post-installation steps have completed. Awaiting user input to clean up installer." >> $setup_log 2>&1
 	whiptail_setup_complete
 	[[ $setup_type != 'iso' ]] && whitpail_ssh_warning
-	echo "Post-installation steps have completed." >> $setup_log 2>&1
 fi
 
 install_cleanup >> "$setup_log" 2>&1