Comment 6 for bug 2067361

I reviewed the tests and added a test case for when an entry does not have a password. Also changed the patch to return None rather that "", which is expected by the current tests. Apparently I should've checked those manually as that was not caught automatically.

This also simplifies the actual patch even more, and should now be in good shape.