Remember me fix.

Remember me is not working. Please see comments in code/commit