Improve labels in change password interface (pull-request #270)