diff --git a/roles/seafile/defaults/main.yml b/roles/seafile/defaults/main.yml
index 169dc35..edab7e3 100644
--- a/roles/seafile/defaults/main.yml
+++ b/roles/seafile/defaults/main.yml
@@ -119,3 +119,6 @@ seafile_site_title: 'Mon cloud privé'
 # Enable ClamAV scanning of files
 # Only available if you run the PRO edition
 seafile_scan_av: True
+
+# Use Go file server. It's still a bit buggy so default to False
+seafile_use_go_fileserver: False
diff --git a/roles/seafile/templates/seafile.conf.j2 b/roles/seafile/templates/seafile.conf.j2
index cfd4faa..120bc9e 100644
--- a/roles/seafile/templates/seafile.conf.j2
+++ b/roles/seafile/templates/seafile.conf.j2
@@ -30,7 +30,7 @@ max_download_dir_size = {{ seafile_max_download_dir_size }}
 {% endif %}
 web_token_expire_time = 7200
 {% if seafile_version is version('9.0.1', '>') %}
-use_go_fileserver = true
+use_go_fileserver = {{ seafile_use_go_fileserver | ternary('true', 'false') }}
 {% endif %}
 
 {% if seafile_license is defined and seafile_scan_av == True %}
diff --git a/roles/sssd_ad_auth/defaults/main.yml b/roles/sssd_ad_auth/defaults/main.yml
index fd072bc..fb35569 100644
--- a/roles/sssd_ad_auth/defaults/main.yml
+++ b/roles/sssd_ad_auth/defaults/main.yml
@@ -14,6 +14,9 @@ ad_gpo_access_control: permissive
 # If set to True, ansible will re join the host to the domain
 ad_force_join: False
 
+# If set to True, ansible will restart sssd, even if it wouldn't be needed otherwise
+ad_restart_sssd: False
+
 # Set to false to disable dyndns update
 ad_dyndns_update: True
 
diff --git a/roles/sssd_ad_auth/tasks/main.yml b/roles/sssd_ad_auth/tasks/main.yml
index d92de86..15c681b 100644
--- a/roles/sssd_ad_auth/tasks/main.yml
+++ b/roles/sssd_ad_auth/tasks/main.yml
@@ -97,5 +97,5 @@
 # so we need to restart it now, so users are available (for eg, ssh authorized_keys setup)
 - name: Restart sssd if needed
   service: name=sssd state=restarted
-  when: ad_join.changed or ad_trusted_join.results | selectattr('changed','equalto',True) | list | length > 0
+  when: ad_join.changed or ad_trusted_join.results | selectattr('changed','equalto',True) | list | length > 0 or ad_restart_sssd
   tags: auth