diff --git a/Koha/UI/Form/Builder/Biblio.pm b/Koha/UI/Form/Builder/Biblio.pm
index 976fdc0fd0..13ecc67ff6 100644
--- a/Koha/UI/Form/Builder/Biblio.pm
+++ b/Koha/UI/Form/Builder/Biblio.pm
@@ -366,10 +366,13 @@ sub build_authorized_values_list {
         }
     }
 
+    my $id_subfield = $subfield;
+    $id_subfield = "00" if $id_subfield eq "@";
+
     return {
         type     => 'select',
-        id       => "tag_".$tag."_subfield_".$subfield."_".$index_tag."_".$index_subfield,
-        name     => "tag_".$tag."_subfield_".$subfield."_".$index_tag."_".$index_subfield,
+        id       => "tag_".$tag."_subfield_".$id_subfield."_".$index_tag."_".$index_subfield,
+        name     => "tag_".$tag."_subfield_".$id_subfield."_".$index_tag."_".$index_subfield,
         default  => $value,
         values   => \@authorised_values,
         labels   => \%authorised_lib,