Fixed nasty bug where password needed a value in passport AND not send empty from AngularJS
Merge conflicts resolved