Feature/login tracking

This should close #192.