diff --git a/circ/circulation.pl b/circ/circulation.pl
index 69fdfc328d..c4210850d5 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -73,7 +73,7 @@ if (!C4::Context->userenv){
 my $barcodes = [];
 my $barcode =  $query->param('barcode');
 # Barcode given by user could be '0'
-if ( $barcode or defined $barcode and $barcode eq '0' ) {
+if ( $barcode || ( defined($barcode) && $barcode eq '0' ) ) {
     $barcodes = [ $barcode ];
 } else {
     my $filefh = $query->upload('uploadfile');
@@ -159,7 +159,7 @@ my $duedatespec    = $query->param('duedatespec')   || $session->param('stickydu
 $duedatespec = eval { output_pref( { dt => dt_from_string( $duedatespec ), dateformat => 'iso' }); }
     if ( $duedatespec );
 my $restoreduedatespec  = $query->param('restoreduedatespec') || $session->param('stickyduedate') || $duedatespec;
-if ($restoreduedatespec and $restoreduedatespec eq "highholds_empty") {
+if ( $restoreduedatespec && $restoreduedatespec eq "highholds_empty" ) {
     undef $restoreduedatespec;
 }
 my $issueconfirmed = $query->param('issueconfirmed');