Some fixes and improvements to update#Password service