diff --git a/loanpy/integrationtests/basic_test.py b/loanpy/integrationtests/basic_test.py
index 5fda6aa0eb00c47e8124fe79476f6463776a510a..56080918fb59173cbcd67bb390f6922bb6396430 100644
--- a/loanpy/integrationtests/basic_test.py
+++ b/loanpy/integrationtests/basic_test.py
@@ -117,7 +117,7 @@ def test_request_loan():
                                     #option1="val1",
                                     files={"-p0": save_dict_to_jsonfile(data)},
                                     **{"auth-token":db.get_connection()._authenticator.auth_token})
-    assert response.stderr is None
+    assert response.stderr is None, response.stderr
     assert response.code == 0
     loan = db.execute_query(f"FIND loan with {COMMENT.name}='{TESTLOANCOMMENT}'", unique=True)
     assert loan.get_property(f"{LOAN_ACCEPTED.name}").value.startswith("20")
@@ -153,7 +153,7 @@ def test_request_loan():
                                     #option1="val1",
                                     files={"-p0": save_dict_to_jsonfile(data)},
                                     **{"auth-token":db.get_connection()._authenticator.auth_token})
-    assert response.stderr is None
+    assert response.stderr is None, response.stderr
     assert response.code == 0
     loan = db.execute_query(f"FIND loan with {COMMENT.name}='{TESTLOANCOMMENT}'", unique=True)
     assert loan.get_property(f"{LOAN_ACCEPTED.name}").value.startswith("20")
@@ -172,7 +172,7 @@ def test_request_loan():
                                     #option1="val1",
                                     files={"-p0": save_dict_to_jsonfile(data)},
                                     **{"auth-token":db.get_connection()._authenticator.auth_token})
-    assert response.stderr is None
+    assert response.stderr is None, response.stderr
     assert response.code == 0
     loan = db.execute_query(f"FIND loan with {COMMENT.name}='{TESTLOANCOMMENT}'", unique=True)
     assert loan.get_property(f"{RETURN_ACCEPTED.name}").value.startswith("20")
diff --git a/loanpy/src/loan/accept_loan_request.py b/loanpy/src/loan/accept_loan_request.py
index ca89c7c6e8e0b3bbebb130309b757b421b2a964c..b1f521a0dcbedf14528a9209c67fc7fc93a2de75 100755
--- a/loanpy/src/loan/accept_loan_request.py
+++ b/loanpy/src/loan/accept_loan_request.py
@@ -31,7 +31,7 @@ from .box_loan import (main, get_loan, F_LOAN,update_loan_state,
 def _accept_loan_request(loan):
     """Update a loan Record: add the `accepted` Property."""
     # This changes the state from "loan_requested" to "loan_accepted".
-    update_loan_state(loan, LOAN_ACCEPTED)
+    update_loan_state(loan, S_LOAN_ACCEPTED)
 
     db.Container().extend([loan]).update()
 
diff --git a/loanpy/src/loan/accept_return_request.py b/loanpy/src/loan/accept_return_request.py
index 045f9671707076fdb2ef01e03cb71aad1cfb891b..5a2ea7acce2d731016256c8cc3f5e108a8cc023b 100755
--- a/loanpy/src/loan/accept_return_request.py
+++ b/loanpy/src/loan/accept_return_request.py
@@ -33,7 +33,7 @@ from .box_loan import (BOX_BORROWED, CONTENT, main, get_loan, set_property,
 def _accept_return_request(loan):
     """Update a loan Record and add the `accepted` Property."""
     # This changes the state from "return_requested" to "return_accepted".
-    update_loan_state(loan, RETURN_ACCEPTED)
+    update_loan_state(loan, S_RETURN_ACCEPTED)
 
     items = set_location_of_borrowed_items(loan, RETURNLOCATION)
     if loan.get_property(CONTENT) is not None and loan.get_property(CONTENT).value:
diff --git a/loanpy/src/loan/request_return.py b/loanpy/src/loan/request_return.py
index 347e6134f5817ab592f8e4dcc96afc68611af2f9..8cd851660c0809fb508b256bffbc065f2ffdcfc7 100755
--- a/loanpy/src/loan/request_return.py
+++ b/loanpy/src/loan/request_return.py
@@ -31,7 +31,7 @@ from caosadvancedtools.serverside.helper import get_timestamp, print_success
 from .box_loan import (BORROWER, COMMENT, CONTENT, EXPECTED_RETURN, F_COMMENT,
                       F_CURRENT_LOCATION, F_EMAIL, F_EXPECTED_RETURN_DATE,
                       F_FIRST_NAME, F_LAST_NAME, F_LOAN, FIRST_NAME, LAST_NAME,update_loan_state,
-                      RETURN_REQUESTED, RETURNLOCATION, S_LENT,
+                      RETURN_REQUESTED, RETURNLOCATION, S_LENT, S_RETURN_REQUESTED,
                       assert_date_in_future, assert_key_in_data,
                       get_loan, insert_or_update_person, main,
                       send_return_request_mail, set_property)