Fix bug 1081340: Measure generic login and logout