Session form fixes