Reorganized login :grin: