join some minor fix, login ready