Fix submissions

Temporary hack to make the client-side submissions behave like the server expects.