Prevent online status flash, closes #128