diff --git a/db_scripts/diff/15558.down b/db_scripts/diff/15558.down
new file mode 100644
index 00000000..f1eb9810
--- /dev/null
+++ b/db_scripts/diff/15558.down
@@ -0,0 +1,15 @@
+USE provisioning;
+
+DELETE FROM voip_preferences WHERE attribute = 'cfo';
+DELETE FROM voip_cf_mappings WHERE type = 'cfo';
+ALTER TABLE voip_cf_mappings MODIFY COLUMN type enum ('cfu','cfb','cfna','cft','cfs','cfr') NOT NULL DEFAULT 'cfu';
+
+update voip_preferences set label = 'Internal Call Forward Rerouting #' where attribute = "cfr";
+update voip_preferences set description = 'The id pointing to the "Call Forward Rerouting" entry in the voip_cf_mappings table' where attribute = "cfr";
+update voip_preferences set label = 'Rerouting Mode' where attribute = "rerouting_mode";
+update voip_preferences set description = "Specifies the operational mode of the Rerouting Call Forward. If set to Whitelist (default) the CFR is executed only for reply codes included in the 'rerouting_codes' list, if set to Blacklist the CFR is executed except for reply codes included in the list." where attribute = "rerouting_mode";
+update voip_preferences set label = 'List of Rerouting Codes' where attribute = "rerouting_codes";
+
+USE accounting;
+
+ALTER TABLE cdr MODIFY COLUMN call_type enum('call','cfu','cft','cfb','cfna','cfs','sms','cfr') NOT NULL DEFAULT 'call';
\ No newline at end of file
diff --git a/db_scripts/diff/15558.up b/db_scripts/diff/15558.up
new file mode 100644
index 00000000..a6f25583
--- /dev/null
+++ b/db_scripts/diff/15558.up
@@ -0,0 +1,37 @@
+USE provisioning;
+
+ALTER TABLE voip_cf_mappings MODIFY COLUMN type enum('cfu','cfb','cfna','cft','cfs','cfr','cfo') NOT NULL DEFAULT 'cfu';
+
+insert into voip_preferences
+  set
+voip_preference_groups_id = (select id from voip_preference_groups where name="Call Forwards"),
+attribute = "cfo",
+label = "Internal Call Forward Overflow #",
+type = 1,
+max_occur = 0,
+usr_pref = 1,
+prof_pref = 0,
+dom_pref = 0,
+peer_pref = 0,
+contract_pref = 0,
+contract_location_pref = 0,
+dev_pref = 0,
+devprof_pref = 0,
+internal = 1,
+expose_to_customer = 0,
+data_type = "int",
+read_only = 1,
+description = 'The id pointing to the "Call Forward Overflow" entry in the voip_cf_mappings table';
+
+-- Rename CFR to Call Forward on Respose
+update voip_preferences set label = 'Internal Call Forward on Response #' where attribute = "cfr";
+update voip_preferences set description = 'The id pointing to the "Call Forward on Response" entry in the voip_cf_mappings table' where attribute = "cfr";
+update voip_preferences set label = 'CFR Mode' where attribute = "rerouting_mode";
+update voip_preferences set description = "Specifies the operational mode of the Call Forward on Response. If set to Whitelist (default) the CFR is executed only for reply codes included in the 'rerouting_codes' list, if set to Blacklist the CFR is executed except for reply codes included in the list." where attribute = "rerouting_mode";
+update voip_preferences set label = 'List of Response Codes that trigger CFR' where attribute = "rerouting_codes";
+
+
+USE accounting;
+
+-- add new options at the end to make alter table run instantly
+ALTER TABLE cdr MODIFY COLUMN call_type enum('call','cfu','cft','cfb','cfna','cfs','sms','cfr','cfo') NOT NULL DEFAULT 'call';
\ No newline at end of file