diff --git a/ks.cfg b/ks.cfg
index d3a0d52..f5a74c6 100644
--- a/ks.cfg
+++ b/ks.cfg
@@ -82,8 +82,6 @@ nss-pam-ldapd
 # System authorization information
 authselect enable-feature with-fingerprint
 
-# Run the Setup Agent on first boot
-firstboot --enable
 
 # Generated using Blivet version 3.12.1
 ignoredisk --only-use=sda
@@ -95,6 +93,10 @@ autopart --type=btrfs
 # Root password
 # This Password is completely unknown to anyone. After installation, the PC should be Member of Domain and the users may use sudo to become superuser.
 rootpw --iscrypted $y$j9T$jpKVkxaFqL6GH6GAgB0Yb/$oc.rfZgnHNlTAIj/boJeI.ZFf1QHvMF7fymZww9bzE3
+#user --name=none
+
+# Do not run the Setup Agent on first boot because it will complain about missing user account which we dont want
+firstboot --disable
 
 %post --log=/root/ks-post.log
 mkdir /opt/sys_config
diff --git a/system_setup/setup_system_full.sh b/system_setup/setup_system_full.sh
index 111a4e3..5dcfafe 100755
--- a/system_setup/setup_system_full.sh
+++ b/system_setup/setup_system_full.sh
@@ -131,6 +131,9 @@ install_sw()
 
   #Set openh264 enabled
   dnf config-manager setopt fedora-cisco-openh264.enabled=1
+
+  # Set default runlevel to graphical logon
+  systemctl set-default graphical.target
 }
 
 ipa_register_host()