Fixed login!

And cleaned up some imports.