This should fix issue #1508

Should be good, edit account/login/etc all work fine.