diff --git a/core/config.class.inc.php b/core/config.class.inc.php
index ab09af11c..ed6c3c4f4 100644
--- a/core/config.class.inc.php
+++ b/core/config.class.inc.php
@@ -576,13 +576,29 @@ class Config
 			'source_of_value'     => '',
 			'show_in_conf_sample' => false,
 		],
-		'email_css'                                => [
-			'type'                => 'string',
-			'description'         => 'CSS that will override the standard stylesheet used for the notifications',
-			'default'             => "",
-			'value'               => "",
+		'email_transport_smtp.allow_self_signed' => array(
+			'type'                => 'bool',
+			'description'         => 'Allow self signed peer certificates',
+			'default'             => false,
+			'value'               => false,
 			'source_of_value'     => '',
 			'show_in_conf_sample' => false,
+		),
+		'email_transport_smtp.verify_peer' => array(
+			'type'                => 'bool',
+			'description'         => 'Verify peer certificate',
+			'default'             => false,
+			'value'               => false,
+			'source_of_value'     => '',
+			'show_in_conf_sample' => false,
+		),
+		'email_css' => [
+			'type' => 'string',
+			'description' => 'CSS that will override the standard stylesheet used for the notifications',
+			'default' => "",
+			'value' => "",
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
 		],
 		'email_default_sender_address' => [
 			'type' => 'string',
diff --git a/datamodels/2.x/itop-oauth-client/datamodel.itop-oauth-client.xml b/datamodels/2.x/itop-oauth-client/datamodel.itop-oauth-client.xml
index 55393b2c0..ea378a4cd 100644
--- a/datamodels/2.x/itop-oauth-client/datamodel.itop-oauth-client.xml
+++ b/datamodels/2.x/itop-oauth-client/datamodel.itop-oauth-client.xml
@@ -66,12 +66,12 @@
           <default_value/>
           <is_null_allowed>true</is_null_allowed>
         </field>
-        <field id="client_id" xsi:type="AttributeText">
+        <field id="client_id" xsi:type="AttributeString">
           <sql>client_id</sql>
           <default_value/>
           <is_null_allowed>false</is_null_allowed>
         </field>
-        <field id="client_secret" xsi:type="AttributeText">
+        <field id="client_secret" xsi:type="AttributePassword">
           <sql>client_secret</sql>
           <default_value/>
           <is_null_allowed>false</is_null_allowed>
@@ -318,7 +318,6 @@ HTML
             <attributes>
               <attribute id="provider"/>
               <attribute id="client_id"/>
-              <attribute id="client_secret"/>
             </attributes>
             <is_blocking>true</is_blocking>
           </rule>
@@ -481,21 +480,6 @@ HTML
   }
             ]]></code>
         </method>
-        <method id="OnUpdate">
-          <static>false</static>
-          <access>protected</access>
-          <type>Overload-DBObject</type>
-          <code><![CDATA[
-      protected function OnUpdate()
-      {
-		    $aChanges = $this->ListChanges();
-        if (array_key_exists('client_id', $aChanges) || array_key_exists('client_secret', $aChanges) || array_key_exists('redirect_url', $aChanges)) {
-            $sMessage = Dict::S('itop-oauth-client:Message:RegenerateToken');
-            self::SetSessionMessage(get_class($this), $this->GetKey(), 'RegenerateToken', $sMessage, 'info', 1);
-        }
-      }
-           ]]></code>
-        </method>
         <method id="DoCheckToWrite">
           <static>false</static>
           <access>public</access>
@@ -541,6 +525,12 @@ HTML
 		    $this->Set('used_scope', 'advanced');
 		    $this->Set('scope', '');
 		}
+    $aChanges = $this->ListChanges();
+    if (array_key_exists('client_id', $aChanges) || array_key_exists('client_secret', $aChanges) || array_key_exists('redirect_url', $aChanges)) {
+        $sMessage = Dict::S('itop-oauth-client:Message:RegenerateToken');
+        self::SetSessionMessage(get_class($this), $this->GetKey(), 'RegenerateToken', $sMessage, 'info', 1);
+        $this->Set('status', 'inactive');
+    }
   }
             ]]></code>
         </method>
@@ -642,7 +632,6 @@ HTML
             <attributes>
               <attribute id="provider"/>
               <attribute id="client_id"/>
-              <attribute id="client_secret"/>
             </attributes>
             <is_blocking>true</is_blocking>
           </rule>
@@ -852,6 +841,12 @@ HTML
 		    $this->Set('used_scope', 'advanced');
 		    $this->Set('scope', '');
 		}
+    $aChanges = $this->ListChanges();
+    if (array_key_exists('client_id', $aChanges) || array_key_exists('client_secret', $aChanges) || array_key_exists('redirect_url', $aChanges)) {
+        $sMessage = Dict::S('itop-oauth-client:Message:RegenerateToken');
+        self::SetSessionMessage(get_class($this), $this->GetKey(), 'RegenerateToken', $sMessage, 'info', 1);
+        $this->Set('status', 'inactive');
+    }
 	}
             ]]></code>
         </method>
@@ -925,21 +920,6 @@ HTML
   }
             ]]></code>
         </method>
-        <method id="OnUpdate">
-          <static>false</static>
-          <access>protected</access>
-          <type>Overload-DBObject</type>
-          <code><![CDATA[
-      protected function OnUpdate()
-      {
-		    $aChanges = $this->ListChanges();
-        if (array_key_exists('client_id', $aChanges) || array_key_exists('client_secret', $aChanges) || array_key_exists('redirect_url', $aChanges)) {
-            $sMessage = Dict::S('itop-oauth-client:Message:RegenerateToken');
-            self::SetSessionMessage(get_class($this), $this->GetKey(), 'RegenerateToken', $sMessage, 'info', 1);
-        }
-      }
-           ]]></code>
-        </method>
       </methods>
     </class>
   </classes>
diff --git a/sources/Core/Email/EmailSwiftMailer.php b/sources/Core/Email/EmailSwiftMailer.php
index fdcfc75fc..d3e23e067 100644
--- a/sources/Core/Email/EmailSwiftMailer.php
+++ b/sources/Core/Email/EmailSwiftMailer.php
@@ -159,11 +159,14 @@ class EmailSwiftMailer extends EMail
 				$sEncryption = static::$m_oConfig->Get('email_transport_smtp.encryption');
 				$sUserName = static::$m_oConfig->Get('email_transport_smtp.username');
 				$sPassword = static::$m_oConfig->Get('email_transport_smtp.password');
+				$bAllowSelfSigned = static::$m_oConfig->Get('email_transport_smtp.allow_self_signed');
+				$bVerifyPeer = static::$m_oConfig->Get('email_transport_smtp.verify_peer');
 
 				$oTransport = new Swift_SmtpTransport($sHost, $sPort, $sEncryption);
 				if (strlen($sUserName) > 0) {
 					$oTransport->setUsername($sUserName);
 					$oTransport->setPassword($sPassword);
+					$oTransport->setStreamOptions(array('ssl' => array('allow_self_signed' => $bAllowSelfSigned, 'verify_peer' => $bVerifyPeer)));
 				}
 				break;