Cursor and login bugfixes