Fix identity key removal warning and session reset
Note to self: rebase on master when !352 (merged) is merged and cherry pick 9f7ce3a5
Contributes towards #508
Edited by Ruben De Smet
Note to self: rebase on master when !352 (merged) is merged and cherry pick 9f7ce3a5
Contributes towards #508