Wait a bit longer after login
And simplify another observer too