diff --git a/includes/account.php b/includes/account.php
index 2d0a784..584439f 100644
--- a/includes/account.php
+++ b/includes/account.php
@@ -310,6 +310,7 @@
 
 			$addys = array();
 			$defaultemail = "";
+			$csrsubject="";
 
 			$user = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".intval($_SESSION['profile']['id'])."'"));
                         if(strlen($user['mname']) == 1)
@@ -390,6 +391,7 @@
 		} else {
 			$id = 6;
 			$cert = $emailid;
+			$_REQUEST['cert']=$emailid;
 		}
 	}
 
@@ -688,6 +690,7 @@
 			exit;
 		}
 		rename($_SESSION['_config']['tmpfname'], $CSRname);
+		chmod($CSRname,0644);
 		mysql_query("update `domaincerts` set `CSR_name`='$CSRname' where `id`='$CSRid'");
 		waitForResult("domaincerts", $CSRid, 11);
 		$query = "select * from `domaincerts` where `id`='$CSRid' and `crt_name` != ''";
@@ -702,6 +705,7 @@
 		} else {
 			$id = 15;
 			$cert = $CSRid;
+			$_REQUEST['cert']=$CSRid;
 		}
 	}
 
@@ -1341,6 +1345,7 @@
 
 			$addys = array();
 			$defaultemail = "";
+			$csrsubject="";
 
 			if($_SESSION['_config']['name'] != "")
 				$csrsubject = "/CN=".$_SESSION['_config']['name'];
@@ -1411,6 +1416,7 @@
 		} else {
 			$id = 19;
 			$cert = $emailid;
+			$_REQUEST['cert']=$emailid;
 		}
 	}
 
@@ -1633,6 +1639,7 @@
 		if(is_array($_SESSION['_config']['rows']))
 			foreach($_SESSION['_config']['rows'] as $row)
 				$csrsubject .= "/commonName=$row";
+		$SAN="";		
 		if(is_array($_SESSION['_config']['altrows']))
 			foreach($_SESSION['_config']['altrows'] as $subalt)
 			{
@@ -1670,6 +1677,7 @@
 
 		$CSRname = $_SESSION['_config']['filepath']."/csr/orgserver-$CSRid.csr";
 		rename($_SESSION['_config']['tmpfname'], $CSRname);
+		chmod($CSRname,0644);
 		mysql_query("update `orgdomaincerts` set `CSR_name`='$CSRname' where `id`='$CSRid'");
 		if(is_array($_SESSION['_config']['rowid']))
 			foreach($_SESSION['_config']['rowid'] as $id)
@@ -1689,6 +1697,7 @@
 		} else {
 			$id = 23;
 			$cert = $CSRid;
+			$_REQUEST['cert']=$CSRid;
 		}
 	}
 
@@ -2431,6 +2440,7 @@
 		} else {
 			$id = 47;
 			$cert = $CSRid;
+			$_REQUEST['cert']=$CSRid;
 		}
 	}