diff -Nur -x '*.orig' -x '*.rej' phpki/phpki-0.82/ca/request_cert.php mezzanine_patched_phpki/phpki-0.82/ca/request_cert.php
--- phpki/phpki-0.82/ca/request_cert.php	2008-12-09 10:58:52.000000000 +0100
+++ mezzanine_patched_phpki/phpki-0.82/ca/request_cert.php	2008-12-09 10:58:20.000000000 +0100
@@ -141,7 +141,7 @@
 	<p><form action='<?=$PHP_SELF?>' method=post>
 	<?= $hidden_fields ?>
 	<input type=hidden name=form_stage value=final>
-  	<input type=submit name=submit value='Yes!  Create and Download' >&nbsp;
+  	<input type=submit name=submit value='Yes' >&nbsp;
   	<input type=submit name=submit value='Go Back'>
 	</form>
 
@@ -165,7 +165,7 @@
 	break;
 
 case 'final':
-	if ($submit == "Yes!  Create and Download") {
+	if ($submit == "Yes") {
 		if (! $serial = CAdb_in($email,$common_name)) {
 			list($ret,$errtxt) = CA_create_cert($cert_type,$country, $province, $locality, $organization, $unit, $common_name, $email, $expiry, $passwd, $keysize);
 
@@ -194,22 +194,9 @@
 				$serial = $errtxt;
         		}
 		}
+		# CLear common_name fiels
+		$common_name = '';
 
-                switch($cert_type) {
-                case 'server':
-                        upload(array("$config[private_dir]/$serial-key.pem","$config[new_certs_dir]/$serial.pem",$config['cacert_pem']), "$common_name ($email).pem",'application/pkix-cert');
-                        break;
-                case 'email':
-                case 'email_signing':
-				case 'time_stamping':
-                case 'vpn_client_server':
-                case 'vpn_client':
-                case 'vpn_server':
-                        upload("$config[pfx_dir]/$serial.pfx", "$common_name ($email).p12", 'application/x-pkcs12');
-                        break;
-                }
-
-		break;
 	}
 default:
 	#