Working on fixing login