diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index e9ff81ea1d..a1f7208edb 100755
--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@@ -710,7 +710,7 @@ my $userflags = 'edit_catalogue';
 
 my $changed_framework = $input->param('changed_framework');
 $frameworkcode = &GetFrameworkCode($biblionumber)
-  if ( $biblionumber and not($frameworkcode) and $op ne 'addbiblio' );
+  if ( $biblionumber and not( defined $frameworkcode) and $op ne 'addbiblio' );
 
 if ($frameworkcode eq 'FA'){
     $userflags = 'fast_cataloging';
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
index f6dc696a86..c66d24acc6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
@@ -122,7 +122,7 @@
         $(".change-framework").on("click", function(){
             var frameworkcode = $(this).data("frameworkcode");
             $("#frameworkcode").val( frameworkcode );
-            Changefwk( frameworkcode );
+            Changefwk();
         });
     });
 
@@ -370,7 +370,7 @@ function GetZ3950Terms(){
     return strQuery;
 }
 
-function Changefwk(FwkList) {
+function Changefwk() {
     var f = document.f;
     f.op.value = "[% op %]";
     f.biblionumber.value = "[% biblionumberdata %]";