Improved Login, lacking close on login