remember original target if not logged in
tweaking remember original target code