LILY-514: fixed registration & user invite