Improved expired session fix
Improved expired session fix

EDDiscovery/EDDiscovery,klightspeed/EDDiscovery,andreaspada/EDDiscovery,EDDiscovery/EDDiscovery,klightspeed/EDDiscovery,klightspeed/EDDiscovery,EDDiscovery/EDDiscovery,andreaspada/EDDiscovery