More rememberme changes