fixed long login time on mac and linux
resolved merge conflict