CONN-92: quick login&chat fix so production won't break