JOJ139: Remove place holders so that we don't get missing password box on no password given
Merge remote-tracking branch 'origin/master'