diff --git a/C4/SIP/ILS.pm b/C4/SIP/ILS.pm
index 099aa9c732..2ea451eaa3 100644
--- a/C4/SIP/ILS.pm
+++ b/C4/SIP/ILS.pm
@@ -175,34 +175,39 @@ sub checkout {
 }
 
 sub checkin {
-    my ($self, $item_id, $trans_date, $return_date,
-	$current_loc, $item_props, $cancel) = @_;
-    my ($patron, $item, $circ);
+    my ( $self, $item_id, $trans_date, $return_date, $current_loc, $item_props, $cancel, $checked_in_ok ) = @_;
+    my ( $patron, $item, $circ );
 
     $circ = C4::SIP::ILS::Transaction::Checkin->new();
+
     # BEGIN TRANSACTION
-    $circ->item($item = C4::SIP::ILS::Item->new( $item_id));
+    $circ->item( $item = C4::SIP::ILS::Item->new($item_id) );
 
     if ($item) {
-        $circ->do_checkin($current_loc, $return_date);
-    } else {
+        $circ->do_checkin( $current_loc, $return_date );
+    }
+    else {
         $circ->alert(1);
         $circ->alert_type(99);
         $circ->screen_msg('Invalid Item');
     }
-	# It's ok to check it in if it exists, and if it was checked out
-	$circ->ok($item && $item->{patron});
 
-	if (!defined($item->{patron})) {
-		$circ->screen_msg("Item not checked out");
-	} else {
-		if ($circ->ok) {
-			$circ->patron($patron = C4::SIP::ILS::Patron->new( $item->{patron}));
-			delete $item->{patron};
-			delete $item->{due_date};
-			$patron->{items} = [ grep {$_ ne $item_id} @{$patron->{items}} ];
-		}
-	}
+    # It's ok to check it in if it exists, and if it was checked out
+    # or it was not checked out but the checked_in_ok flag was set
+    $circ->ok( ( $checked_in_ok && $item ) || ( $item && $item->{patron} ) );
+
+    if ( !defined( $item->{patron} ) ) {
+        $circ->screen_msg("Item not checked out") unless $checked_in_ok;
+    }
+    else {
+        if ( $circ->ok ) {
+            $circ->patron( $patron = C4::SIP::ILS::Patron->new( $item->{patron} ) );
+            delete $item->{patron};
+            delete $item->{due_date};
+            $patron->{items} = [ grep { $_ ne $item_id } @{ $patron->{items} } ];
+        }
+    }
+
     # END TRANSACTION
 
     return $circ;
diff --git a/C4/SIP/Sip/MsgType.pm b/C4/SIP/Sip/MsgType.pm
index 23c3d8405a..df4a88bf16 100644
--- a/C4/SIP/Sip/MsgType.pm
+++ b/C4/SIP/Sip/MsgType.pm
@@ -643,7 +643,7 @@ sub handle_checkin {
         syslog("LOG_WARNING", "received no-block checkin from terminal '%s'", $account->{id});
         $status = $ils->checkin_no_block($item_id, $trans_date, $return_date, $item_props, $cancel);
     } else {
-        $status = $ils->checkin($item_id, $trans_date, $return_date, $my_branch, $item_props, $cancel);
+        $status = $ils->checkin($item_id, $trans_date, $return_date, $my_branch, $item_props, $cancel, $account->{checked_in_ok});
     }
 
     $patron = $status->patron;
diff --git a/etc/SIPconfig.xml b/etc/SIPconfig.xml
index 8d2d77bcc8..141bc4f9e2 100644
--- a/etc/SIPconfig.xml
+++ b/etc/SIPconfig.xml
@@ -36,7 +36,7 @@
   </listeners>
 
   <accounts>
-      <login id="term1"  password="term1" delimiter="|" error-detect="enabled" institution="CPL" encoding="ascii" />
+      <login id="term1"  password="term1" delimiter="|" error-detect="enabled" institution="CPL" encoding="ascii" checked_in_ok="1" />
       <login id="koha"   password="koha"  delimiter="|" error-detect="enabled" institution="kohalibrary" encoding="utf8" />
       <login id="koha2"  password="koha" institution="kohalibrary2" terminator="CR" />
       <login id="lpl-sc" password="1234" institution="LPL" />