Make form race conditions smarter