@@ -, +, @@ 
---
 circ/returns.pl                                             | 1 +
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 5 +++++
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt     | 9 +++++----
 3 files changed, 11 insertions(+), 4 deletions(-)
--- a/circ/returns.pl	
+++ a/circ/returns.pl	
@@ -351,6 +351,7 @@ if ($barcode) {
         $riduedate{0}     = 0;
         push( @inputloop, \%input );
     }
+    $template->param( privacy => $borrower->{privacy} );
 }
 $template->param( inputloop => \@inputloop );
 
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt	
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt	
@@ -588,6 +588,11 @@ No patron matched <span class="ex">[% message %]</span>
 
 [% IF ( borrowernumber ) %]
 <div class="yui-g">
+
+[% IF privacy == 2 AND NOT Koha.Preference('AnonymousPatron') %]
+    <div class="dialog alert"><strong>Error:</strong> This patron has requested a privacy on returning item but the AnonymousPatron pref is not set correctly.</div>
+[% END %]
+
 [% IF ( !noissues ) || ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') )%]
 [% IF ( flagged ) %]
 <div class="yui-u first">
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt	
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt	
@@ -117,10 +117,11 @@ $(document).ready(function () {
 	<div id="yui-main">
 
 <div class="yui-g">
-[% IF !Koha.Preference('AnonymousPatron') %]
-    [% IF Koha.Preference('OPACPrivacy') %]
-        <div class="dialog alert"><strong>Error:</strong> The system preference OPACPrivacy is set but AnonymousPatron is not! Please correct this before continuing circulation.</div>
-    [% END %]
+
+[% IF privacy == 2 AND NOT Koha.Preference('AnonymousPatron') %]
+    <div class="dialog alert"><strong>Error:</strong> This patron has requested a privacy on returning item but the AnonymousPatron pref is not set correctly.</div>
+[% ELSIF NOT Koha.Preference('AnonymousPatron') AND Koha.Preference('OPACPrivacy') %]
+    <div class="dialog alert"><strong>Error:</strong> The system preference OPACPrivacy is set but AnonymousPatron is not! Please correct this before continuing circulation.</div>
 [% END %]
 
 [% IF additional_materials %]
--