[IM] Improved remember handling