Merged in Issue816PasswordChangeNotWorking (pull request #354)
Fixes password change not working. Also fixes PEP8 (line too long).
Manually tested. [skip ci] (as no automatic interface testing)
Fixes password change not working. Also fixes PEP8 (line too long).
Manually tested. [skip ci] (as no automatic interface testing)