on your login page, the forms action was not updated to pass the existing query string.
i changed the action to use the code suggested in my first reply
you didn't provide a test login, so i can't test this, but i believe it should fixture issue.
Your friends over here at WebAssist! These Dreamweaver extensions will assist you in building unlimited, custom websites.
These out-of-the-box solutions provide you proven, tested applications that can be up and running now. Build a store, a gallery, or a web-based email solution.