Waqas/for545 user last thread not remembered

Note: I will add the tests in the subsequent commit
ditto for the next two tests.