Remove misleading comments
Make login a bit more user friendly