diff --git a/bin/v_add_user b/bin/v_add_user
index e8121f54d..ee8b32d7e 100755
--- a/bin/v_add_user
+++ b/bin/v_add_user
@@ -47,7 +47,7 @@ if [ ! -z "$fname" ]; then
 fi
 
 is_user_free "$user"
-is_package_valid "$package"
+is_package_valid
 
 
 #----------------------------------------------------------#
diff --git a/web/add/user/index.php b/web/add/user/index.php
index 7a9d02204..b4d0f44e5 100644
--- a/web/add/user/index.php
+++ b/web/add/user/index.php
@@ -34,6 +34,7 @@ if ($_SESSION['user'] == 'admin') {
         $v_email = escapeshellarg($_POST['v_email']);
         $v_fname = escapeshellarg($_POST['v_fname']);
         $v_lname = escapeshellarg($_POST['v_lname']);
+        if (empty($_POST['v_notify'])) $v_notify = 'off';
 
         // Check for errors
         if (!empty($errors[0])) {
@@ -52,6 +53,24 @@ if ($_SESSION['user'] == 'admin') {
                 if (empty($error)) $error = 'Error: vesta did not return any output.';
                 $_SESSION['error_msg'] = $error;
             } else {
+                if (empty($v_notify)) {
+                    $to = $_POST['v_email'];
+                    $subject = "Welcome to Vesta Control Panel";
+                    $hostname = exec('hostname');
+                    $from = "Vesta Control Panel <noreply@".$hostname.">";
+                    if (!empty($_POST['v_fname'])) {
+                        $mailtext = "Hello ".$_POST['v_fname']." ".$_POST['v_lname'].",\n";
+                    } else {
+                        $mailtext = "Hello,\n";
+                    }
+                    $mailtext .= "Your account has been created successfully and is ready to use.\n\n";
+                    $mailtext .= "https://".$_SERVER['HTTP_HOST']."/login/\n";
+                    $mailtext .= "username: ".$_POST['v_username']."\n";
+                    $mailtext .= "password: ".$_POST['v_password']."\n\n";
+                    $mailtext .= "Have a nice day,\nThe VestaCP Team\n";
+                    send_email($to, $subject, $mailtext, $from);
+                }
+
                 $_SESSION['ok_msg'] = "OK: user <b>".$_POST[v_username]."</b> has been created successfully.";
                 unset($v_username);
                 unset($v_password);
@@ -63,7 +82,6 @@ if ($_SESSION['user'] == 'admin') {
         }
     }
 
-
     exec (VESTA_CMD."v_list_user_packages json", $output, $return_var);
     check_error($return_var);
     $data = json_decode(implode('', $output), true);
diff --git a/web/templates/admin/add_user.html b/web/templates/admin/add_user.html
index 69965958b..8de111051 100644
--- a/web/templates/admin/add_user.html
+++ b/web/templates/admin/add_user.html
@@ -47,6 +47,8 @@ document.v_add_user.v_password.value = randomstring;
             <tr><td><input type="text" size="20" class="add-input" name="v_fname" <?php if (!empty($v_fname)) echo "value=".$v_fname; ?>></tr>
             <tr><td class="add-text" style="padding: 10px 0 0 2px;">Last Name</td></tr>
             <tr><td><input type="text" size="20" class="add-input" name="v_lname" <?php if (!empty($v_lname)) echo "value=".$v_lname; ?>></tr>
+            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Send login credentials to the user's email address</td></tr>
+            <tr><td><input type="checkbox" size="20" class="add-checkbox" name="v_notify" <?php if (empty($v_notify)) echo "checked=yes"; ?>></tr>
             <tr><td style="padding: 24px 0 0 0;">
                 <input type="submit" name="ok" value="OK" class="add-button">
                 </form>