Added some stuff to fix the Win login bug.  I don't think it will work,
but try it.