diff --git a/web/add/user/index.php b/web/add/user/index.php
index 26de1020..32f91562 100644
--- a/web/add/user/index.php
+++ b/web/add/user/index.php
@@ -50,6 +50,11 @@ if (!empty($_POST['ok'])) {
         $pw_len = strlen($_POST['v_password']);
         if ($pw_len < 6 ) $_SESSION['error_msg'] = __('Password is too short.',$error_msg);
     }
+    // Check username length
+    if (empty($_SESSION['error_msg'])) {
+	$username_len = strlen($_POST['v_username']);
+	if ($username_len > 12) $_SESSION['error_msg'] = __('Username is too long. Maximum 12 characters', $error_msg);
+    }
 
     // Protect input
     $v_username = escapeshellarg($_POST['v_username']);
diff --git a/web/generate/ssl/index.php b/web/generate/ssl/index.php
index 3f96ebf9..5ccc2f29 100644
--- a/web/generate/ssl/index.php
+++ b/web/generate/ssl/index.php
@@ -40,6 +40,7 @@ if (empty($_POST['v_country'])) $errors[] = __('country');
 if (empty($_POST['v_state'])) $errors[] = __('domain');
 if (empty($_POST['v_locality'])) $errors[] = __('city');
 if (empty($_POST['v_org'])) $errors[] = __('organization');
+if (empty($_POST['v_email'])) $errors[] = __('email');
 $v_domain = $_POST['v_domain'];
 $v_email = $_POST['v_email'];
 $v_country = $_POST['v_country'];