diff --git a/roles/fai/defaults/main.yml b/roles/fai/defaults/main.yml
index f62419e..9e7ec96 100644
--- a/roles/fai/defaults/main.yml
+++ b/roles/fai/defaults/main.yml
@@ -30,7 +30,7 @@ fai_dir_nfsroot_boot: "{{ fai_dir_nfsroot }}/boot"
 fai_config_archive: "config.tar"
 fai_squashfs_file: "squash.img"
 fai_squashfs_path: "{{ fai_dir_download + '/' + fai_squashfs_file }}"
-#fai_loguser: "fai"
+fai_loguser:
 fai_menu_default: 'HW4F Desktop Jammy'
 fai_nfsroot_force_rebuild: false
 
diff --git a/roles/fai/templates/etc/fai/fai.conf.j2 b/roles/fai/templates/etc/fai/fai.conf.j2
index 3fde673..f8bf825 100644
--- a/roles/fai/templates/etc/fai/fai.conf.j2
+++ b/roles/fai/templates/etc/fai/fai.conf.j2
@@ -49,11 +49,15 @@
 # For example, you can use write permissions for the group linuxadm.
 # chgrp linuxadm /srv/tftp/fai;chmod g+w /srv/tftp/fai.
 # If the variable is undefined, this feature is disabled.
-{% if fai_loguser is defined %}
-LOGUSER={{ fai_loguser }}
-{% else %}
+{% if fai_loguser is defined and
+      fai_loguser is none %}
 ### DISABLE LOG UPLOAD
 LOGUSER=
+{% elif fai_loguser is defined and
+      fai_loguser is not none %}
+LOGUSER={{ fai_loguser }}
+{% else %}
+#LOGUSER=
 {% endif %}
 
 # Protocol for saving logs