Better routing on logout
Better routing on login