Updated login session credential stuff
Merge branch 'ET-Dev2' into new_master