diff --git a/data/data/agent/systemd/units/agent-interactive-console.service b/data/data/agent/systemd/units/agent-interactive-console.service
index 9c6cdfdc5c..26ea372f15 100644
--- a/data/data/agent/systemd/units/agent-interactive-console.service
+++ b/data/data/agent/systemd/units/agent-interactive-console.service
@@ -1,16 +1,18 @@
 [Unit]
 Description=Get interactive user configuration at boot
 After=network-pre.target NetworkManager.service pre-network-manager-config.service selinux.service
-Before=network.target network.service agent.service node-zero.service NetworkManager-wait-online.service
+Before=getty@tty1.service network.target network.service agent.service node-zero.service NetworkManager-wait-online.service
 
 [Service]
 Type=oneshot
 TTYPath=/dev/tty15
 EnvironmentFile=/etc/assisted/agent-installer.env
+ExecStartPre=/usr/bin/kill -s SIGRTMIN+21 1
 ExecStartPre=/usr/bin/chvt 15
 ExecStartPre=mkdir -p /var/log/agent
 ExecStart=/usr/local/bin/agent-tui
 ExecStartPost=/usr/bin/chvt 1
+ExecStartPost=/usr/bin/kill -s SIGRTMIN+20 1
 TimeoutStartSec=0
 StandardInput=tty
 TTYVHangup=yes
@@ -18,4 +20,4 @@ TTYVTDisallocate=yes
 
 [Install]
 WantedBy=default.target
-RequiredBy=sshd.service systemd-logind.service getty@tty1.service
\ No newline at end of file
+RequiredBy=sshd.service systemd-logind.service getty@tty1.service