Issue #3314925 by kalpaitch, LeoAlcci: Always redirects to current page when clicking on the login / logout link