Users form doesn't warn user if no password is provided Defect #349
Merge remote-tracking branch 'origin/dev' into dev