Some login fixes
Preferences screen works, but menu does not.
Merge pull request #413 from einhverfr/master

some more fixes