Changed login expired to remove gui as well.
Merge remote-tracking branch 'origin/dev' into dev