fix for issue #687
Merge pull request #702 from stevewithington/develop

fix for issue #687
Fixing passowd field markup
Merge branch 'develop'