Fix for login flow, minor updates