Fix displaying watchers/watching for incorrect user

Fix initialization of users - correctly initialize last user in the list
Merge remote-tracking branch 'mgencur/master' to pick fixes