diff --git a/includes/account.php b/includes/account.php
index 6855acc..011c284 100644
--- a/includes/account.php
+++ b/includes/account.php
@@ -764,7 +764,7 @@
 				mysql_query("update `domaincerts` set `subject`='$subject',`csr_name`='$newfile' where `id`='$newid'");
 
 				echo _("Renewing").": ".$_SESSION['_config']['0.CN']."<br>\n";
-				waitForResult("domaincerts", $newid,0,0);
+				waitForResult("domaincerts", $newid,$oldid,0);
 				$query = "select * from `domaincerts` where `id`='$newid' and `crt_name` != ''";
 				$res = mysql_query($query);
 				if(mysql_num_rows($res) <= 0)
@@ -892,7 +892,7 @@
 					mysql_query("insert into `emaillink` set `emailid`='".$r2['emailid']."',
 							`emailcertsid`='$newid'");
 				}
-				waitForResult("emailcerts", $newid);
+				waitForResult("emailcerts", $newid,$oldid,0);
 				$query = "select * from `emailcerts` where `id`='$newid' and `crt_name` != ''";
 				$res = mysql_query($query);
 				if(mysql_num_rows($res) <= 0)
@@ -1352,7 +1352,7 @@
 			fclose($fp);
 			mysql_query("update `orgemailcerts` set `csr_name`='$CSRname' where `id`='$emailid'");
 		}
-		waitForResult("orgemailcerts", $emailid);
+		waitForResult("orgemailcerts", $emailid,$oldid);
 		$query = "select * from `orgemailcerts` where `id`='$emailid' and `crt_name` != ''";
 		$res = mysql_query($query);
 		if(mysql_num_rows($res) <= 0)
@@ -1376,6 +1376,7 @@
 			echo _("Now renewing the following certificates:")."<br>\n";
 			foreach($revokeid as $id)
 			{
+				echo "Renewing certificate #$id ...\n<br/>";
 				$id = intval($id);
 				$query = "select *,UNIX_TIMESTAMP(`revoked`) as `revoke` from `orgemailcerts`, `org`
 						where `orgemailcerts`.`id`='$id' and `org`.`memid`='".$_SESSION['profile']['id']."' and
@@ -1401,24 +1402,22 @@
 						`csr_name`='".$row['csr_name']."', 
 						`created`='".$row['created']."', 
 						`modified`=NOW(),
-						`subject`='".$row['subject']."', 
 						`rootcert`='".$row['rootcert']."'";
 				mysql_query($query);
 				$newid = mysql_insert_id();
 				$newfile = $_SESSION['_config']['filepath']."/csr/orgclient-$newid.csr";
 				copy($row['csr_name'], $newfile);
 				mysql_query("update `orgemailcerts` set `csr_name`='$newfile' where `id`='$newid'");
-				waitForResult("orgemailcerts", $newid);
+				waitForResult("orgemailcerts", $newid,$oldid,0);
 				$query = "select * from `orgemailcerts` where `id`='$newid' and `crt_name` != ''";
 				$res = mysql_query($query);
-				if(mysql_num_rows($res) <= 0)
+				if(mysql_num_rows($res) > 0)
 				{
-					printf(_("Your certificate request has failed to be processed correctly, see %sthe WIKI page%s for reasons and solutions."), "<a href='http://wiki.cacert.org/wiki/FAQ/CertificateRenewal'>", "</a>");
-				} else {
 					printf(_("Certificate for '%s' has been renewed."), $row['CN']);
 					echo "<a href='account.php?id=19&cert=$newid' target='_new'>".
 						_("Click here")."</a> "._("to install your certificate.");
 				}
+				echo("<br/>");
 			}
 		}
 		else
@@ -1630,7 +1629,7 @@
 		if(is_array($_SESSION['_config']['altid']))
 			foreach($_SESSION['_config']['altid'] as $id)
 				mysql_query("insert into `orgdomlink` set `orgdomid`='$id', `orgcertid`='$CSRid'");
-		waitForResult("orgdomaincerts", $CSRid);
+		waitForResult("orgdomaincerts", $CSRid,$oldid);
 		$query = "select * from `orgdomaincerts` where `id`='$CSRid' and `crt_name` != ''";
 		$res = mysql_query($query);
 		if(mysql_num_rows($res) <= 0)
@@ -1690,7 +1689,7 @@
 				$res = mysql_query("select * from `orgdomlink` where `orgcertid`='".$row['id']."'");
 				while($r2 = mysql_fetch_assoc($res))
 					mysql_query("insert into `orgdomlink` set `orgdomid`='".$r2['id']."', `orgcertid`='$newid'");
-				waitForResult("orgdomaincerts", $newid);
+				waitForResult("orgdomaincerts", $newid,$oldid,0);
 				$query = "select * from `orgdomaincerts` where `id`='$newid' and `crt_name` != ''";
 				$res = mysql_query($query);
 				if(mysql_num_rows($res) <= 0)
@@ -2358,7 +2357,7 @@
 		fputs($fp, $_SESSION['_config']['CSR']);
 		fclose($fp);
 		mysql_query("update `domaincerts` set `CSR_name`='$CSRname' where `id`='$CSRid'");
-		waitForResult("domaincerts", $CSRid);
+		waitForResult("domaincerts", $CSRid,$oldid);
 		$query = "select * from `domaincerts` where `id`='$CSRid' and `crt_name` != ''";
 		$res = mysql_query($query);
 		if(mysql_num_rows($res) <= 0)