Initial commit from patch #4

Joe Huggansrequested to merge
issue/user_registrationpassword-3500896:3500896-userpasswordform-argument-5 into 2.0.x

Closes #3500896

Merge request reports