diff --git a/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeEncrypted.php b/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeEncrypted.php
new file mode 100644
index 000000000..1f983f495
--- /dev/null
+++ b/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeEncrypted.php
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * Safely record the modification of an encrypted field
+ */
+class CMDBChangeOpSetAttributeEncrypted extends CMDBChangeOpSetAttribute
+{
+    /**
+     * @inheritDoc
+     */
+    public static function Init()
+    {
+        $aParams = array
+        (
+            "category" => "core/cmdb, grant_by_profile",
+            "key_type" => "",
+            "name_attcode" => "change",
+            "state_attcode" => "",
+            "reconc_keys" => array(),
+            "db_table" => "priv_changeop_setatt_encrypted",
+            "db_key_field" => "id",
+            "db_finalclass_field" => "",
+        );
+        MetaModel::Init_Params($aParams);
+        MetaModel::Init_InheritAttributes();
+        MetaModel::Init_AddAttribute(new AttributeEncryptedString("prevstring", array("sql" => 'data', "default_value" => '', "is_null_allowed" => true, "allowed_values" => null, "depends_on" => array())));
+
+        // Display lists
+        MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for the complete details
+        MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for a list
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function GetDescription()
+    {
+        // Temporary, until we change the options of GetDescription() -needs a more global revision
+        $bIsHtml = true;
+
+        $sResult = '';
+        $oTargetObjectClass = $this->Get('objclass');
+        $oTargetObjectKey = $this->Get('objkey');
+        $oTargetSearch = new DBObjectSearch($oTargetObjectClass);
+        $oTargetSearch->AddCondition('id', $oTargetObjectKey, '=');
+
+        $oMonoObjectSet = new DBObjectSet($oTargetSearch);
+        if (UserRights::IsActionAllowedOnAttribute($this->Get('objclass'), $this->Get('attcode'), UR_ACTION_READ, $oMonoObjectSet) == UR_ALLOWED_YES) {
+            if (MetaModel::IsValidAttCode($this->Get('objclass'), $this->Get('attcode'))) {
+                $oAttDef = MetaModel::GetAttributeDef($this->Get('objclass'), $this->Get('attcode'));
+                $sAttName = $oAttDef->GetLabel();
+            } else {
+                // The attribute was renamed or removed from the object ?
+                $sAttName = $this->Get('attcode');
+            }
+            $sPrevString = $this->GetAsHTML('prevstring');
+            $sResult = Dict::Format('Change:AttName_Changed_PreviousValue_OldValue', $sAttName, $sPrevString);
+        }
+        return $sResult;
+    }
+}
\ No newline at end of file