diff --git a/server/auth/handlers/handler.go b/server/auth/handlers/handler.go
index da730f9a5..b8e87b702 100644
--- a/server/auth/handlers/handler.go
+++ b/server/auth/handlers/handler.go
@@ -202,6 +202,12 @@ func (h *AuthHandlers) handle(fn handlerFn) http.HandlerFunc {
 				return
 			}
 
+			// Caching 32MB to memory, the rest to disk
+			err = r.ParseMultipartForm(32 << 20)
+			if err != nil && err != http.ErrNotMultipart {
+				return
+			}
+
 			if !validFormPost(r) {
 				req.Status = http.StatusRequestEntityTooLarge
 				return