Fix issue #2

Also fix passwords