Split the session form into two different forms

For some plugin the session identifier is not required, for other it is. 
So splitting into two forms allow us to use one or the other.
Handle case when there is no session to provide