Merge with HEAD: Collector #256: Added a check in _doChangeUser to make sure passwords isn't encrypted twice.