Merge "Improve changePassword.php error handling"