Clean up workflow for loggin in and out and automatic re-routing around those actions