diff --git a/tasks/certbot.yml b/tasks/certbot.yml
index f8eb566..f512b14 100644
--- a/tasks/certbot.yml
+++ b/tasks/certbot.yml
@@ -24,13 +24,13 @@
 - name: generate certificates for domaine and subdomains
   vars:
     subdomains: "-d {{ apache_server_alias | join( ' -d ' ) }}"
-  command: certbot certonly --webroot --webroot-path {{ apache_document_root }} -d {{ apache_server_name }} {{ subdomains }}
+  command: certbot certonly --agree-tos -m {{ apache_ssl_root_email }} --webroot --webroot-path {{ apache_document_root }} -d {{ apache_server_name }} {{ subdomains }}
   args:
     creates: "{{ apache_ssl_chain }}"
   when: apache_server_alias is defined
 
 - name: generate certificates
-  command: certbot certonly --webroot --webroot-path {{ apache_document_root }} -d {{ apache_server_name }}
+  command: certbot certonly --agree-tos -m {{ apache_ssl_root_email }} --webroot --webroot-path {{ apache_document_root }} -d {{ apache_server_name }}
   args:
     creates: "{{ apache_ssl_chain }}"
   when: apache_server_alias is not defined
diff --git a/tasks/main.yml b/tasks/main.yml
index 61c2459..7a3218c 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -69,5 +69,5 @@
 
 - name: zabbix setup
   import_tasks: zabbix.yml
-  when: apache_use_zabbix and apache_use_ssl
+  when: apache_use_zabbix|bool
   tags: zabbix, ssl
\ No newline at end of file