Waqas/for545 user last thread not remembered

Note: I will add the tests in the subsequent commit
Just put this value into the literal above