diff --git a/includes/account.php b/includes/account.php
index 10973e8..8f0b372 100644
--- a/includes/account.php
+++ b/includes/account.php
@@ -227,6 +227,8 @@
 				exit;
 			}
 			$user = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".$_SESSION['profile']['id']."'"));
+			if(strlen($user['mname']) == 1)
+				$user['mname'] .= '.';
 			if($_SESSION['_config']['incname'] <= 0 || $_SESSION['_config']['incname'] > 4)
 				$emails .= "commonName = CAcert WoT User\n";
 			if($_SESSION['_config']['incname'] == 1)
@@ -265,6 +267,8 @@
 			$defaultemail = "";
 
 			$user = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".$_SESSION['profile']['id']."'"));
+                        if(strlen($user['mname']) == 1)
+                                $user['mname'] .= '.';
 			if($_SESSION['_config']['incname'] <= 0 || $_SESSION['_config']['incname'] > 4)
 				$csrsubject = "/CN=CAcert WoT User";
 			if($_SESSION['_config']['incname'] == 1)