diff --git a/system_setup/install.sh b/system_setup/install.sh
index 7187ccf..30689dc 100755
--- a/system_setup/install.sh
+++ b/system_setup/install.sh
@@ -490,7 +490,7 @@ read -r -p "Run configure.sh now to set up your environment? [y/N]: " RUN_CONF
 if [[ "${RUN_CONF,,}" == "y" ]]; then
     if [[ -n "$SUDO_USER" ]]; then
         info "Running configure.sh as user '$SUDO_USER'..."
-        su - "$SUDO_USER" -c "bash '$CONF_SCRIPT'"
+        su - "$SUDO_USER" -c "DISPLAY='${DISPLAY}' WAYLAND_DISPLAY='${WAYLAND_DISPLAY}' bash '$CONF_SCRIPT'"
     else
         echo
         echo "configure.sh must be run as a non-root user. Please run:"
diff --git a/system_setup/setup_system.inc.sh b/system_setup/setup_system.inc.sh
index 523f7b3..6256c27 100755
--- a/system_setup/setup_system.inc.sh
+++ b/system_setup/setup_system.inc.sh
@@ -102,9 +102,6 @@ get_nc_token() {
 
         REQTOKEN=$( echo "${REQJSON}" | grep -oP '(?<="token":")[^"]+(?=")' )
         REQURL=$( echo "${REQJSON}" | grep -oP '(?<="login":")[^"]+(?=")' )
-        if [[ -z ${DISPLAY} ]]; then
-            export DISPLAY=:0
-        fi
         /usr/bin/firefox "${REQURL}" &
 
         for i in {1..200}