Modified Login process with singleton