Changed list to Dictionary, login page