diff --git a/roles/ipaclient/library/ipaclient_setup_firefox.py b/roles/ipaclient/library/ipaclient_setup_firefox.py
index 36116aeb..7095692e 100644
--- a/roles/ipaclient/library/ipaclient_setup_firefox.py
+++ b/roles/ipaclient/library/ipaclient_setup_firefox.py
@@ -37,12 +37,12 @@ description:
 options:
   domain:
     description: Primary DNS domain of the IPA deployment
-    required: no
+    required: yes
   firefox_dir:
     description:
       Specify directory where Firefox is installed (for example
       '/usr/lib/firefox')
-    required: yes
+    required: no
 author:
     - Thomas Woerner
 '''
diff --git a/roles/ipaclient/tasks/install.yml b/roles/ipaclient/tasks/install.yml
index 4421f0c4..97bf7949 100644
--- a/roles/ipaclient/tasks/install.yml
+++ b/roles/ipaclient/tasks/install.yml
@@ -350,6 +350,7 @@
     - name: Install - Configure firefox
       ipaclient_setup_firefox:
         firefox_dir: "{{ ipaclient_firefox_dir | default(omit) }}"
+        domain: "{{ result_ipaclient_test.domain }}"
       when: ipaclient_configure_firefox | bool
 
     - name: Install - Configure NIS