Improve routing to return to requested view after login