Added better integration for Remember Me