Fixes the submit form logout problem
Attachment stuff works