diff --git a/roles/inspircd/defaults/main.yml b/roles/inspircd/defaults/main.yml
index 43d8e88..fa934c5 100644
--- a/roles/inspircd/defaults/main.yml
+++ b/roles/inspircd/defaults/main.yml
@@ -26,13 +26,12 @@ inspircd_modules:
   - spanningtree
   - userip
   - watch
+inspircd_modules_additional: []
 
 inspircd_server_hostname: "{{ inventory_hostname }}"
 inspircd_server_description: "{{ inventory_hostname }}"
-inspircd_server_id: null
 inspircd_server_network: "{{ inventory_hostname }}"
 
-inspircd_admin_name: null
 inspircd_admin_nick: admin
 inspircd_admin_email: noreply@example.com
 
diff --git a/roles/inspircd/templates/etc/inspircd/inspircd.conf.2 b/roles/inspircd/templates/etc/inspircd/inspircd.conf.2
index a67e9a2..8f3c720 100644
--- a/roles/inspircd/templates/etc/inspircd/inspircd.conf.2
+++ b/roles/inspircd/templates/etc/inspircd/inspircd.conf.2
@@ -19,14 +19,14 @@
 
 <server
     name="{{ inspircd_server_hostname }}"
-{% if inspircd_server_id != null %}
+{% if inspircd_server_id is defined %}
     id="{{ inspircd_server_id }}"
 {% endif %}
     description="{{ inspircd_server_description }}"
     network="{{ inspircd_server_network }}">
 
 <admin
-{% if inspircd_admin_name != null %}
+{% if inspircd_admin_name is defined %}
     name="{{ inspircd_admin_name }}"
 {% endif %}
     nick="{{ inspircd_admin_nick }}"