diff --git a/labels/label-edit-batch.pl b/labels/label-edit-batch.pl
index 29d2dd3f7b..8740c573de 100755
--- a/labels/label-edit-batch.pl
+++ b/labels/label-edit-batch.pl
@@ -61,7 +61,7 @@ my @label_ids = $cgi->param('label_id') if $cgi->param('label_id');
 my @item_numbers = $cgi->param('item_number') if $cgi->param('item_number');
 my $barcode = $cgi->param('barcode') if $cgi->param('barcode');
 
-my $branch_code = get_branch_code_from_name($template->{VARS}->{'LoginBranchname'});
+my $branch_code = C4::Context->userenv->{'branch'};
 
 if ($op eq 'remove') {
     $batch = C4::Labels::Batch->retrieve(batch_id => $batch_id);
diff --git a/labels/label-manage.pl b/labels/label-manage.pl
index 70302e8762..c70ea6cfd3 100755
--- a/labels/label-manage.pl
+++ b/labels/label-manage.pl
@@ -74,7 +74,7 @@ my $op = $cgi->param('op') || 'none';
 my $element_id = $cgi->param('element_id') || undef;
 my $error = $cgi->param('error') || 0;
 
-my $branch_code = ($label_element eq 'batch' ? get_branch_code_from_name($template->{VARS}->{'LoginBranchname'}) : '');
+my $branch_code = ($label_element eq 'batch' ? C4::Context->userenv->{'branch'} : '');
 
 if ($op eq 'delete') {
     if          ($label_element eq 'layout')    {$error = C4::Labels::Layout::delete(layout_id => $element_id);}
diff --git a/patroncards/edit-batch.pl b/patroncards/edit-batch.pl
index 50bbbf413c..fb0abf5f22 100755
--- a/patroncards/edit-batch.pl
+++ b/patroncards/edit-batch.pl
@@ -60,7 +60,7 @@ my @item_numbers = $cgi->param('item_number') if $cgi->param('item_number');
 my @borrower_numbers = $cgi->param('borrower_number') if $cgi->param('borrower_number');
 my $errstr = $cgi->param('error') || '';
 
-my $branch_code = get_branch_code_from_name($template->{VARS}->{'LoginBranchname'});
+my $branch_code = C4::Context->userenv->{'branch'};
 
 if ($op eq 'remove') {
     $batch = C4::Patroncards::Batch->retrieve(batch_id => $batch_id);
diff --git a/patroncards/manage.pl b/patroncards/manage.pl
index 71e1b82eeb..46361cc6f1 100755
--- a/patroncards/manage.pl
+++ b/patroncards/manage.pl
@@ -73,7 +73,7 @@ my $display_columns = { layout =>   [  # db column       => {col label
 };
 
 my $errstr = ($cgi->param('error') ? $cgi->param('error') : '');
-my $branch_code = ($card_element eq 'batch' ? get_branch_code_from_name($template->{VARS}->{'LoginBranchname'}) : '');
+my $branch_code = ($card_element eq 'batch' ? C4::Context->userenv->{'branch'} : '');
 
 if ($op eq 'delete') {
     my $err = 0;
diff --git a/tools/manage-marc-import.pl b/tools/manage-marc-import.pl
index 3c43dabe1a..34d2639c1a 100755
--- a/tools/manage-marc-import.pl
+++ b/tools/manage-marc-import.pl
@@ -189,7 +189,7 @@ sub redo_matching {
 sub create_labelbatch_from_importbatch {
 	my ($batch_id) = @_;
         my $err = undef;
-        my $branch_code = get_branch_code_from_name($template->param('LoginBranchname'));
+        my $branch_code = C4::Context->userenv->{'branch'};
         my $batch = C4::Labels::Batch->new(branch_code => $branch_code);
 	my @items = GetItemNumbersFromImportBatch($batch_id);
         if (grep{$_ == 0} @items) {