Refine even more login mechanism