Fixed minor bugs with Login