diff --git a/includes/account.php b/includes/account.php
index a4b2333..e78b465 100644
--- a/includes/account.php
+++ b/includes/account.php
@@ -309,7 +309,6 @@
 			if(is_array($addys))
 			foreach($addys as $addy)
 				mysql_query("insert into `emaillink` set `emailcertsid`='$emailid', `emailid`='$addy'");
-			$CSRname = $_SESSION['_config']['filepath']."/csr/client-".intval($emailid).".csr";
 			$CSRname=generatecertpath("csr","client",$emailid);
 			$fp = fopen($CSRname, "w");
 			fputs($fp, $emails);
@@ -397,7 +396,6 @@
 			if(is_array($addys))
 			foreach($addys as $addy)
 				mysql_query("insert into `emaillink` set `emailcertsid`='$emailid', `emailid`='".mysql_real_escape_string($addy)."'");
-			$CSRname = $_SESSION['_config']['filepath']."/csr/client-$emailid.csr";
 			$CSRname=generatecertpath("csr","client",$emailid);
 			$fp = fopen($CSRname, "w");
 			fputs($fp, $csr);
@@ -724,7 +722,6 @@
 		foreach($_SESSION['_config']['altid'] as $dom)
 			mysql_query("insert into `domlink` set `certid`='$CSRid', `domid`='$dom'");
 
-		$CSRname = $_SESSION['_config']['filepath']."/csr/server-$CSRid.csr";
 		$CSRname=generatecertpath("csr","server",$CSRid);
 		if(!file_exists($_SESSION['_config']['tmpfname']))
 		{
@@ -789,7 +786,6 @@
 						`pkhash`='".$row['pkhash']."'";
 				mysql_query($query);
 				$newid = mysql_insert_id();
-				$newfile = $_SESSION['_config']['filepath']."/csr/server-$newid.csr";
 				$newfile=generatecertpath("csr","server",$newid);
 				copy($row['csr_name'], $newfile);
 				$_SESSION['_config']['subject'] = trim(`/usr/bin/openssl req -text -noout -in "$newfile"|tr -d "\\0"|grep "Subject:"`);
@@ -957,7 +953,6 @@
 						`rootcert`='".$row['rootcert']."'";
 				mysql_query($query);
 				$newid = mysql_insert_id();
-				$newfile = $_SESSION['_config']['filepath']."/csr/client-$newid.csr";
 				$newfile=generatecertpath("csr","client",$newid);
 				copy($row['csr_name'], $newfile);
 				mysql_query("update `emailcerts` set `csr_name`='$newfile' where `id`='$newid'");
@@ -1386,7 +1381,6 @@
 			foreach($_SESSION['_config']['domids'] as $addy)
 				mysql_query("insert into `domemaillink` set `emailcertsid`='$emailid', `emailid`='$addy'");
 
-			$CSRname = $_SESSION['_config']['filepath']."/csr/orgclient-$emailid.csr";
 			$CSRname=generatecertpath("csr","orgclient",$emailid);
 			$fp = fopen($CSRname, "w");
 			fputs($fp, $emails);
@@ -1464,7 +1458,6 @@
 			foreach($_SESSION['_config']['domids'] as $addy)
 				mysql_query("insert into `domemaillink` set `emailcertsid`='$emailid', `emailid`='$addy'");
 
-			$CSRname = $_SESSION['_config']['filepath']."/csr/orgclient-$emailid.csr";
 			$CSRname=generatecertpath("csr","orgclient",$emailid);
 			$fp = fopen($CSRname, "w");
 			fputs($fp, $csr);
@@ -1527,7 +1520,6 @@
 						`rootcert`='".$row['rootcert']."'";
 				mysql_query($query);
 				$newid = mysql_insert_id();
-				$newfile = $_SESSION['_config']['filepath']."/csr/orgclient-$newid.csr";
 				$newfile=generatecertpath("csr","orgclient",$newid);
 				copy($row['csr_name'], $newfile);
 				mysql_query("update `orgemailcerts` set `csr_name`='$newfile' where `id`='$newid'");
@@ -1745,7 +1737,6 @@
                 mysql_query($query);
 		$CSRid = mysql_insert_id();
 
-		$CSRname = $_SESSION['_config']['filepath']."/csr/orgserver-$CSRid.csr";
 		$CSRname=generatecertpath("csr","orgserver",$CSRid);
 		rename($_SESSION['_config']['tmpfname'], $CSRname);
 		chmod($CSRname,0644);
@@ -1812,7 +1803,6 @@
 				mysql_query($query);
 				$newid = mysql_insert_id();
 				//echo "NewID: $newid<br/>\n";
-				$newfile = $_SESSION['_config']['filepath']."/csr/orgserver-$newid.csr";
 				$newfile=generatecertpath("csr","orgserver",$newid);
 				copy($row['csr_name'], $newfile);
 				mysql_query("update `orgdomaincerts` set `csr_name`='$newfile' where `id`='$newid'");
@@ -2506,7 +2496,6 @@
 		foreach($_SESSION['_config']['altid'] as $dom)
 			mysql_query("insert into `domlink` set `certid`='$CSRid', `domid`='$dom'");
 
-		$CSRname = $_SESSION['_config']['filepath']."/csr/server-$CSRid.csr";
 		$CSRname=generatecertpath("csr","server",$CSRid);
 		$fp = fopen($CSRname, "w");
 		fputs($fp, $_SESSION['_config']['CSR']);