diff --git a/modules/backend/classes/FormField.php b/modules/backend/classes/FormField.php
index 82e3d92cc..daf6bc03c 100644
--- a/modules/backend/classes/FormField.php
+++ b/modules/backend/classes/FormField.php
@@ -385,7 +385,7 @@ class FormField
     }
 
     /**
-     * Adds attribues used specifically by the TriggerAPI
+     * Adds attributes used specifically by the TriggerAPI
      * @param  array $attributes
      * @param  string $position
      * @return array
diff --git a/modules/backend/widgets/Form.php b/modules/backend/widgets/Form.php
index f64b5e357..577485136 100644
--- a/modules/backend/widgets/Form.php
+++ b/modules/backend/widgets/Form.php
@@ -713,7 +713,7 @@ class Form extends WidgetBase
 
     /**
      * Parses a field's name
-     * @param stirng $field Field name
+     * @param string $field Field name
      * @return array [columnName, context]
      */
     public function getFieldName($field)
diff --git a/modules/system/models/MailSettings.php b/modules/system/models/MailSettings.php
index 6d17b22dd..94803257a 100644
--- a/modules/system/models/MailSettings.php
+++ b/modules/system/models/MailSettings.php
@@ -11,6 +11,8 @@ use Model;
  */
 class MailSettings extends Model
 {
+    use \October\Rain\Database\Traits\Validation;
+
     public $implement = ['System.Behaviors.SettingsModel'];
 
     public $settingsCode = 'system_mail_settings';
@@ -23,6 +25,14 @@ class MailSettings extends Model
     const MODE_MAILGUN  = 'mailgun';
     const MODE_MANDRILL = 'mandrill';
 
+    /*
+     * Validation rules
+     */ 
+    public $rules = [
+        'sender_name'  => 'required',
+        'sender_email' => 'required|email'
+    ];
+
     public function initSettingsData()
     {
         $config = App::make('config');