diff --git a/Makefile b/Makefile
index 67545cf..900a548 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,7 @@ endif
 
 
 # Configuration: Use values from command line if provided, default values otherwise.
+at_spi_service        ?= True
 background_images_dir ?= $(realpath $(DESTDIR)/usr/share/backgrounds)
 config_dir            ?= $(realpath $(DESTDIR)/etc/lightdm)
 debug_mode            ?= False
@@ -31,6 +32,7 @@ user_image            ?= $(themes_dir)/default/img/antergos.png
 
 
 _apply_config:
+	@$(SET_CONFIG) at_spi_service        $(at_spi_service)
 	@$(SET_CONFIG) background_images_dir $(background_images_dir)
 	@$(SET_CONFIG) config_dir            $(config_dir)
 	@$(SET_CONFIG) debug_mode            $(debug_mode)
diff --git a/web-greeter/whither.yml b/web-greeter/whither.yml
index 5738be7..e2960ed 100644
--- a/web-greeter/whither.yml
+++ b/web-greeter/whither.yml
@@ -5,6 +5,10 @@ WebGreeter:
     # Whither's Config
     whither:
         allow_remote_urls: False
+        at_spi_service:
+            enabled: '@at_spi_service@'
+            command: /usr/lib/at-spi2-core/at-spi-bus-launcher
+            arg: --launch-immediately
         app_id: com.antergos.web-greeter
         debug_mode: '@debug_mode@'
         entry_point: