diff --git a/opac/opac-account.pl b/opac/opac-account.pl
index 3adab8b285..3216281e29 100755
--- a/opac/opac-account.pl
+++ b/opac/opac-account.pl
@@ -52,7 +52,9 @@ foreach my $row (@$accts) {
 }
 
 
-$template->param( ACCOUNT_LINES => $accts );
+$template->param( ACCOUNT_LINES => $accts,
+			     LibraryName => C4::Context->preference("LibraryName"),
+ );
 
 $template->param( total => $total );
 
diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index dbdfff4356..eda7ddf6ad 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -52,7 +52,9 @@ my $sitearray=\@websites;
 $template->param(BIBLIO_RESULTS => $resultsarray);
 $template->param(ITEM_RESULTS => $itemsarray);
 $template->param(WEB_RESULTS => $webarray);
-$template->param(SITE_RESULTS => $sitearray);
+$template->param(SITE_RESULTS => $sitearray,
+			     LibraryName => C4::Context->preference("LibraryName"),
+);
 
 output_html_with_http_headers $query, $cookie, $template->output;
 
diff --git a/opac/opac-new.pl b/opac/opac-new.pl
index 4449e57636..4fbb8c2a3b 100755
--- a/opac/opac-new.pl
+++ b/opac/opac-new.pl
@@ -61,7 +61,9 @@ $template->param(nextstartfrom => $nextstartfrom,
 				itemtype => ItemType($itemtype),
 				duration => $duration);
 
-$template->param(SEARCH_RESULTS => $resultsarray);
+$template->param(SEARCH_RESULTS => $resultsarray,
+			     LibraryName => C4::Context->preference("LibraryName"),
+);
 
 my $numbers;
 @$numbers = ();
diff --git a/opac/opac-readingrecord.pl b/opac/opac-readingrecord.pl
index c2cfa403e8..bedd4517e5 100755
--- a/opac/opac-readingrecord.pl
+++ b/opac/opac-readingrecord.pl
@@ -49,7 +49,9 @@ foreach my $row (@$issues) {
 }
 
 $template->param(count => $count);
-$template->param(READING_RECORD => $issues);
+$template->param(READING_RECORD => $issues,
+			     LibraryName => C4::Context->preference("LibraryName"),
+);
 
 
 output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl
index e993e581cf..93adabf698 100755
--- a/opac/opac-reserve.pl
+++ b/opac/opac-reserve.pl
@@ -169,7 +169,9 @@ for (my $rownum=0;$rownum<$publictypes[0]->{'count'} ;$rownum++) {
 }
 $template->param(TYPE_ROWS => \@typerows);
 $width = 2*$width -1;
-$template->param(totalwidth => 2*$width-1);
+$template->param(totalwidth => 2*$width-1,
+			     LibraryName => C4::Context->preference("LibraryName"),
+);
 
 if ($query->param('item_types_selected')) {
 	# this is what happens after the itemtypes have been selected. Stage 2
diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index 80736a6fbb..297761cdb0 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -15,7 +15,7 @@ my $dbh=C4::Context->dbh;
 my $sth=$dbh->prepare("select description,itemtype from itemtypes order by description");
 $sth->execute;
 while (my ($description,$itemtype) = $sth->fetchrow) {
-    $classlist.="<option value=\"$itemtype\">$description\n";
+    $classlist.="<option value=\"$itemtype\">$description</option>\n";
 }
 
 
@@ -30,6 +30,8 @@ my ($template, $borrowernumber, $cookie)
 			 });
 
 
-$template->param(classlist => $classlist);
+$template->param(classlist => $classlist,
+			     LibraryName => C4::Context->preference("LibraryName"),
+);
 
 output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/opac/opac-searchresults.pl b/opac/opac-searchresults.pl
index c5e5aa617f..7de1a7c91d 100755
--- a/opac/opac-searchresults.pl
+++ b/opac/opac-searchresults.pl
@@ -122,6 +122,8 @@ if ($count>$number_of_results) {
     }
 }
 
-$template->param(numbers => $numbers);
+$template->param(numbers => $numbers,
+			     LibraryName => C4::Context->preference("LibraryName"),
+);
 
 output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/opac/opac-user.pl b/opac/opac-user.pl
index 88cbdcbaec..e3b00dad9c 100755
--- a/opac/opac-user.pl
+++ b/opac/opac-user.pl
@@ -131,7 +131,9 @@ foreach my $res (@$reserves) {
 }
 
 $template->param(WAITING => \@waiting);
-$template->param(waiting_count => $wcount);
+$template->param(waiting_count => $wcount,
+			     LibraryName => C4::Context->preference("LibraryName"),
+);
 
 output_html_with_http_headers $query, $cookie, $template->output;
 
diff --git a/opac/opac-userdetails.pl b/opac/opac-userdetails.pl
index b0bfe8472d..0942ec6fc0 100755
--- a/opac/opac-userdetails.pl
+++ b/opac/opac-userdetails.pl
@@ -30,7 +30,9 @@ $borr->{'dateofbirth'}  = format_date($borr->{'dateofbirth'});
 $borr->{'ethnicity'}    = fixEthnicity($borr->{'ethnicity'});
 
 
-$template->param($borr);
+$template->param($borr,
+			     LibraryName => C4::Context->preference("LibraryName"),
+);
 
 output_html_with_http_headers $query, $cookie, $template->output;
 
diff --git a/opac/opac-userupdate.pl b/opac/opac-userupdate.pl
index a34c638781..d9ebf7f9df 100755
--- a/opac/opac-userupdate.pl
+++ b/opac/opac-userupdate.pl
@@ -87,6 +87,8 @@ $borr->{'ethnicity'}    = fixEthnicity($borr->{'ethnicity'});
 my @bordat;
 $bordat[0] = $borr;
 
-$template->param(BORROWER_INFO => \@bordat);
+$template->param(BORROWER_INFO => \@bordat,
+			     LibraryName => C4::Context->preference("LibraryName"),
+);
 
 output_html_with_http_headers $query, $cookie, $template->output;