You made a separate service provider for the remember feature which I like a lot :+1:

But then, there is this special case here, would it be possible to avoid that?