diff --git a/lib/rdweb.cpp b/lib/rdweb.cpp
index ede0d81d..5999d128 100644
--- a/lib/rdweb.cpp
+++ b/lib/rdweb.cpp
@@ -783,13 +783,7 @@ bool RDParsePost(std::map<QString,QString> *vars)
   //
   // Initialize Temp Directory Path
   //
-  if(getenv("TMPDIR")!=NULL) {
-    tempdir=getenv("TMPDIR");
-  }
-  else {
-    tempdir="/tmp";
-  }
-  tempdir+="/rivendellXXXXXX";
+  tempdir = RDTempDir() + "/rivendellXXXXXX";
 
   //
   // Get message part separator