Session Timeout/Logout with tabbed dashboard broken

When the dashboard has tabs configured and a session timeout occurs the user is dropped into a screen with an Add Portlet box, Home link, and a log-in link. The Home and log-in links both are circular, in that they take the user back to that same screen appending the current destination to the url, thus building quite a large url with several clicks. The user is dropped into the Add Portlet screen regardless of the link clicked and even happens on a page reload.

The only work-arounds are:
1. Click on Add Portlet which then redirects to the appropriate login page and then on successful login takes the user to the Add Portlet admin. This of course is undesirable.
2. Have the user manually remove the extra url params and press enter.

Both of these fixes are not desirable for the business folks and are annoying to the IT folks.

Image 1. shows the url in the browser after a link click.
Image 2. shows the actual page content
Image 3. shows the url in the browser after clicking on the log-in link.