Separate login counter update from person retrieval
Fix Rubocop errors