Merge jaconda.im user fix.