diff --git a/includes/account.php b/includes/account.php
index cf70138..a614431 100644
--- a/includes/account.php
+++ b/includes/account.php
@@ -1362,8 +1362,8 @@
 			fclose($fp);
 			mysql_query("update `orgemailcerts` set `csr_name`='$CSRname' where `id`='$emailid'");
 		} else if($_REQUEST['keytype'] == "MS" || $_REQUEST['keytype']=="VI") {
-			$csr = "-----BEGIN CERTIFICATE REQUEST-----\n".$CSR."-----END CERTIFICATE REQUEST-----\n";
-			$tmpfname = tempnam("/tmp", "CSR");
+			$csr = "-----BEGIN CERTIFICATE REQUEST-----\n".$_REQUEST['CSR']."-----END CERTIFICATE REQUEST-----\n";
+			$tmpfname = tempnam("/tmp", "CSROrgClient");
 			$fp = fopen($tmpfname, "w");
 			fputs($fp, $csr);
 			fclose($fp);