diff --git a/account_credit_control/data.xml b/account_credit_control/data.xml
index aa46023da..09fc3cced 100644
--- a/account_credit_control/data.xml
+++ b/account_credit_control/data.xml
@@ -25,6 +25,21 @@
       <field name="do_nothing" eval="1"/>
     </record>
 
+    <!-- no follow policy -->
+    <record model="credit.control.policy.level"
+            id="no_follow_1">
+      <field name="name">No follow</field>
+      <field name="level" eval="1"/>
+      <field name="computation_mode">net_days</field>
+      <field name="delay_days" eval="0"/>
+      <field name="email_template_id" ref="email_template_credit_control_base"/>
+      <field name="policy_id" ref="credit_control_no_follow"/>
+      <field name="channel">email</field>
+      <field name="custom_text">Manual no follow</field>
+
+      <field name="custom_mail_text">Manual no follow</field>
+    </record>
+
     <!-- policy 1 -->
     <record model="credit.control.policy"
             id="credit_control_3_time">
diff --git a/account_credit_control/wizard/credit_control_policy_changer.py b/account_credit_control/wizard/credit_control_policy_changer.py
index d6678cffb..2c7113dd7 100644
--- a/account_credit_control/wizard/credit_control_policy_changer.py
+++ b/account_credit_control/wizard/credit_control_policy_changer.py
@@ -36,7 +36,8 @@ class credit_control_policy_changer(orm.TransientModel):
                                          'New Policy to Apply',
                                          required=True),
         'new_policy_level_id': fields.many2one('credit.control.policy.level',
-                                               'New level to apply'),
+                                               'New level to apply',
+                                               required=True),
         # Only used to provide dynamic filtering on form
         'do_nothing': fields.boolean('No follow  policy'),
         'move_line_ids': fields.many2many('account.move.line',
@@ -154,15 +155,14 @@ class credit_control_policy_changer(orm.TransientModel):
         # As it is a manual action
         # We also ignore rounding tolerance
         generated_ids = None
-        if not wizard.new_policy_id.do_nothing:
-            generated_ids = credit_line_model.create_or_update_from_mv_lines(
-                cr, uid, [],
-                [x.id for x in wizard.move_line_ids],
-                wizard.new_policy_level_id.id,
-                controlling_date,
-                check_tolerance=False,
-                context=None
-            )
+        generated_ids = credit_line_model.create_or_update_from_mv_lines(
+            cr, uid, [],
+            [x.id for x in wizard.move_line_ids],
+            wizard.new_policy_level_id.id,
+            controlling_date,
+            check_tolerance=False,
+            context=None
+        )
         self._set_invoice_policy(cr, uid,
                                  wizard.move_line_ids,
                                  wizard.new_policy_id,
diff --git a/account_credit_control/wizard/credit_control_policy_changer_view.xml b/account_credit_control/wizard/credit_control_policy_changer_view.xml
index 61a81db63..f65356ea0 100644
--- a/account_credit_control/wizard/credit_control_policy_changer_view.xml
+++ b/account_credit_control/wizard/credit_control_policy_changer_view.xml
@@ -16,8 +16,7 @@
              <field name="do_nothing"
                     invisible="1"/>
              <field name="new_policy_level_id"
-                    domain="[('policy_id', '=', new_policy_id)]"
-                    attrs="{'required': [('do_nothing', '=', False)]}"/>
+                    domain="[('policy_id', '=', new_policy_id)]"/>
            </group>
            <group></group>
          </group>