Might have fixed the capture_password issue...

@phlco It takes forever for me to test this. I feel like it should work, and doesn't break stuff. Thoughts?