diff --git a/roles/freeradius/templates/mods-available/linelog.j2 b/roles/freeradius/templates/mods-available/linelog.j2
index fbe5a77..0cd6de3 100644
--- a/roles/freeradius/templates/mods-available/linelog.j2
+++ b/roles/freeradius/templates/mods-available/linelog.j2
@@ -24,7 +24,7 @@ linelog linelog_inner_postauth {
     }
 }
 
-linelog_outer_prefix = {{ '${.linelog_prefix} from %{%{Calling-Station-Id}:-unknown} via %{NAS-IP-Address} (%{Client-Shortname}):' | enquote }}
+linelog_outer_prefix = {{ '${.linelog_prefix} from %{%{Calling-Station-Id}:-unknown} (%{jsonquote:%{Called-Station-SSID}}) via %{NAS-IP-Address} (%{Client-Shortname}):' | enquote }}
 
 linelog linelog_outer_authz_user {
     filename = syslog
diff --git a/roles/freeradius/templates/sites-available/outer-aurore.j2 b/roles/freeradius/templates/sites-available/outer-aurore.j2
index 87eb0bf..cec2c17 100644
--- a/roles/freeradius/templates/sites-available/outer-aurore.j2
+++ b/roles/freeradius/templates/sites-available/outer-aurore.j2
@@ -25,6 +25,8 @@ server outer-aurore {
     }
 
     authorize {
+        rewrite_calling_station_id
+        rewrite_called_station_id
         linelog_outer_authz_user
         filter_username
         split_username_nai