Refine login more