Fix login system to go to the right places