Fix: Login not shown at start
Merge remote-tracking branch 'upstream/master'