Cleanups
small bugfix at login