Add check to skip re-registering.
Test returning to session end.