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

I've created CONN-93 to do the proper fix