Merge login window fix from 4.1 branch