Fixed the last bugs on login