Fixed comparing watchers in server with a rare case
Removed unused password argument
Fixed more unused arguments