LOGIN improvements