Remember token fix