diff --git a/roles/freeradius/templates/mods-available/linelog.j2 b/roles/freeradius/templates/mods-available/linelog.j2
index 8f221e2..8cb08df 100644
--- a/roles/freeradius/templates/mods-available/linelog.j2
+++ b/roles/freeradius/templates/mods-available/linelog.j2
@@ -18,7 +18,7 @@ linelog linelog_inner_postauth {
     reference = {{ 'messages.%{%{reply:Packet-Type}:-default}' | enquote }}
 
     messages {
-        Access-Accept = {{ '${...linelog_inner_prefix} accepted "%{jsonquote:%{User-Name}}" (VLAN %{reply:Tunnel-Private-Group-Id})' | enquote }}
+        Access-Accept = {{ '${...linelog_inner_prefix} accepted "%{jsonquote:%{User-Name}}" (VLAN %{reply:Tunnel-Private-Group-Id:-unknown})' | enquote }}
         Access-Reject = {{ '${...linelog_inner_prefix} rejected "%{jsonquote:%{User-Name}}" (%{%{Module-Failure-Message}:-unknown})' | enquote }}
         default = {{ '${...linelog_inner_prefix} unknown packet type %{Packet-Type}' | enquote }}
     }
@@ -47,7 +47,7 @@ linelog linelog_outer_postauth {
     reference = {{ 'messages.%{%{reply:Packet-Type}:-default}' | enquote }}
 
     messages {
-        Access-Accept = {{ '${...linelog_outer_prefix} accepted "%{jsonquote:%{User-Name}}" (VLAN %{reply:Tunnel-Private-Group-Id})' | enquote }}
+        Access-Accept = {{ '${...linelog_outer_prefix} accepted "%{jsonquote:%{User-Name}}" (VLAN %{reply:Tunnel-Private-Group-Id:-unknown})' | enquote }}
         Access-Reject = {{ '${...linelog_outer_prefix} rejected "%{jsonquote:%{User-Name}}" (%{%{Module-Failure-Message}:-unknown})' | enquote }}
         default = {{ '${...linelog_outer_prefix} unknown packet type %{Packet-Type}' | enquote }}
     }
diff --git a/roles/freeradius/templates/sites-available/inner-aurore.j2 b/roles/freeradius/templates/sites-available/inner-aurore.j2
index dd64f73..a3de3aa 100644
--- a/roles/freeradius/templates/sites-available/inner-aurore.j2
+++ b/roles/freeradius/templates/sites-available/inner-aurore.j2
@@ -38,18 +38,10 @@ server inner-aurore {
     }
 
     post-auth {
-        update outer.session-state {
-            Tunnel-Type := VLAN
-            Tunnel-Medium-Type := IEEE-802
-        }
         if (&reply:Tunnel-Private-Group-ID) {
             update outer.session-state {
                 Tunnel-Private-Group-ID := &reply:Tunnel-Private-Group-ID
             }
-        } else {
-            update outer.session-state {
-                Tunnel-Private-Group-ID := {{ radiusd__guest_vlan | int }}
-            }
         }
         linelog_inner_postauth
         Post-Auth-Type reject {
diff --git a/roles/freeradius/templates/sites-available/outer-aurore.j2 b/roles/freeradius/templates/sites-available/outer-aurore.j2
index c7a00fc..7507b02 100644
--- a/roles/freeradius/templates/sites-available/outer-aurore.j2
+++ b/roles/freeradius/templates/sites-available/outer-aurore.j2
@@ -55,11 +55,21 @@ server outer-aurore {
                 && &request:User-Name \
                 && (&reply:User-Name == &request:User-Name)) {
             update reply {
-                &User-Name !* ANY
+                User-Name !* ANY
             }
         }
-        update {
-            reply: += &session-state:
+        update reply {
+            Tunnel-Medium-Type := IEEE-802
+            Tunnel-Type := VLAN
+        }
+        if (&session-state:Tunnel-Private-Group-ID) {
+            update reply {
+                Tunnel-Private-Group-ID := &session-state:Tunnel-Private-Group-ID
+            }
+        } else {
+            update reply {
+                Tunnel-Private-Group-ID := {{ radiusd__guest_vlan | int }}
+            }
         }
         Post-Auth-Type reject {
             attr_filter.access_reject