Merge pull request #676 from stianst/master

Fixes to admin console random logout