diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c
index 8a629d7..d638fce 100644
--- a/dlls/mshtml/persist.c
+++ b/dlls/mshtml/persist.c
@@ -84,6 +84,10 @@ static int fix_headers(char *buf, DWORD post_len)
         }
     }
 
+    for(ptr = buf; ptr[0] == '\r' && ptr[1] == '\n'; ptr += 2);
+    if(ptr != buf)
+        memmove(buf, ptr, strlen(ptr)+1);
+
     return strlen(buf);
 }
 
@@ -170,7 +174,8 @@ static nsIInputStream *get_post_data_stream(IBindCtx *bctx)
 
         TRACE("data = %s\n", debugstr_an(data, len+post_len));
 
-        ret = create_nsstream(data, len+post_len);
+        if(len)
+            ret = create_nsstream(data, len+post_len);
     }
 
     CoTaskMemFree(headers);