login fix and events fix