diff --git a/CHANGELOG.md b/CHANGELOG.md
index a425fdb..74ca4f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,8 @@
  - Enh #331: Added Ukrainian translations (kwazaro)
  - Enh #324: Added option to restrict user assignments to roles only (CheckeredFlag)
  - Enh #224: Added option to require consent (eseperio)
-
+ - Enh: Added classMap for MailService (necrox87)
+  
 ## 1.5.0 April 19, 2019
  - Fix: Fix condition in EmailChangeService (it was always false) (borisaeric)
  - Fix #198: Updated translations by quique, bizley, TonisOrmisson, guogan, Dezinger, maxxer, wautvda, mrbig00, fabiomlferreira, WeeSee
diff --git a/docs/enhancing-and-overriding/overriding-classes.md b/docs/enhancing-and-overriding/overriding-classes.md
index 1a1d307..b0e9ddb 100644
--- a/docs/enhancing-and-overriding/overriding-classes.md
+++ b/docs/enhancing-and-overriding/overriding-classes.md
@@ -24,6 +24,8 @@ The following are the classes that you can override throughout that attribute:
     - LoginForm
     - SettingsForm
     - RecoveryForm
+- Service Classes
+    - MailService
     
 
 How to Override
@@ -52,6 +54,8 @@ $defaults = [
     'LoginForm' => 'Da\User\Form\LoginForm',
     'SettingsForm' => 'Da\User\Form\SettingsForm',
     'RecoveryForm' => 'Da\User\Form\RecoveryForm',
+    // --- services
+    'MailService' => 'Da\User\Service\MailService',
 ];
 ```
 
diff --git a/src/User/Bootstrap.php b/src/User/Bootstrap.php
index 5a22a9c..fd51c33 100644
--- a/src/User/Bootstrap.php
+++ b/src/User/Bootstrap.php
@@ -325,6 +325,8 @@ class Bootstrap implements BootstrapInterface
             'LoginForm' => 'Da\User\Form\LoginForm',
             'SettingsForm' => 'Da\User\Form\SettingsForm',
             'RecoveryForm' => 'Da\User\Form\RecoveryForm',
+            // --- services
+            'MailService' => 'Da\User\Service\MailService',
         ];
 
         $routes = [
@@ -349,6 +351,9 @@ class Bootstrap implements BootstrapInterface
                 'SettingsForm',
                 'RecoveryForm',
             ],
+            'Da\User\Service' => [
+                'MailService',
+            ],
         ];
 
         $mapping = array_merge($defaults, $userClassMap);