Continuing fix for issue #27. Buttons now work, but it still will not return password, no matter what I do. Really frustrating.