Minor fixes for password recovery/change