Fixed Issue #1 - I had to include a hidden vield to include get the
returnUrl in the query string.