Fixed login message and cleanup