password reset, password change done

Please merge