diff --git a/account_credit_control/account.py b/account_credit_control/account.py
index c8928f624..01aa8c642 100644
--- a/account_credit_control/account.py
+++ b/account_credit_control/account.py
@@ -31,33 +31,13 @@ class AccountAccount(Model):
 
     _inherit = "account.account"
 
-    def _check_account_type_compatibility(self, cursor, uid, acc_ids, context=None):
-        """We check that account is of type reconcile"""
-        if isinstance(acc_ids, (int, long)):
-            acc_ids = [acc_ids]
-        for acc in self.browse(cursor, uid, acc_ids, context):
-            if acc.credit_policy_id and not acc.reconcile:
-                return False
-        return True
-
     _columns = {
-        'credit_policy_id': fields.many2one('credit.control.policy',
-                                            'Credit Control Policy',
-                                             help=("The Credit Control Policy "
-                                                   "used for this account. This "
-                                                   "setting can be forced on the "
-                                                   "partner or the invoice.")),
-
         'credit_control_line_ids': fields.one2many('credit.control.line',
                                                    'account_id',
                                                    string='Credit Lines',
                                                    readonly=True)
     }
 
-    _constraints = [(_check_account_type_compatibility,
-                     _('You can not set a credit control policy on a non reconcilable account'),
-                    ['credit_policy_id'])]
-
 
 class AccountInvoice(Model):
     """Add a link to a credit control policy on account.account"""
diff --git a/account_credit_control/account_view.xml b/account_credit_control/account_view.xml
index 7d8036921..36fecb432 100644
--- a/account_credit_control/account_view.xml
+++ b/account_credit_control/account_view.xml
@@ -1,18 +1,6 @@
 <openerp>
   <data>
 
-    <record id="account_followup_form_view" model="ir.ui.view">
-      <field name="name">account.followup.form.view</field>
-      <field name="model">account.account</field>
-      <field name="inherit_id" ref="account.view_account_form" />
-      <field name="type">form</field>
-      <field name="arch" type="xml">
-        <field name="reconcile" position="after">
-            <field name="credit_policy_id"   groups="account_credit_control.group_account_credit_control_manager,account_credit_control.group_account_credit_control_user"/>
-        </field>
-      </field>
-    </record>
-
     <act_window
         id="act_account_credit_relation_relation"
         name="Credit Lines"
diff --git a/account_credit_control/policy.py b/account_credit_control/policy.py
index 972c987ce..77ae46f27 100644
--- a/account_credit_control/policy.py
+++ b/account_credit_control/policy.py
@@ -29,43 +29,24 @@ class CreditControlPolicy(Model):
     _description = """Define a reminder policy"""
     _columns = {'name': fields.char('Name', required=True, size=128),
 
-                'level_ids' : fields.one2many('credit.control.policy.level',
+                'level_ids': fields.one2many('credit.control.policy.level',
                                                      'policy_id',
                                                      'Policy Levels'),
 
-                'do_nothing' : fields.boolean('Do nothing',
+                'do_nothing': fields.boolean('Do nothing',
                                               help=('For policies which should not '
                                                     'generate lines or are obsolete')),
 
-                'company_id' : fields.many2one('res.company', 'Company')
+                'company_id': fields.many2one('res.company', 'Company'),
+
+                'account_ids': fields.many2many(
+                    'account.account',
+                    string='Accounts',
+                    required=True,
+                    domain="[('reconcile', '=', True)]",
+                    help='This policy will be active only for the selected accounts'),
                 }
 
-
-    def _get_account_related_lines(self, cursor, uid, policy_id, controlling_date, context=None):
-        """ Get the move lines for a policy.
-
-        Do not use direct SQL in order to respect security rules.
-
-        Assume that only the receivable lines have a maturity date and that
-        accounts used in the policy are reconcilable.
-        """
-        if context is None:
-            context = {}
-        move_l_obj = self.pool.get('account.move.line')
-        account_obj = self.pool.get('account.account')
-        acc_ids =  account_obj.search(
-            cursor, uid, [('credit_policy_id', '=', policy_id)], context=context)
-        if not acc_ids:
-            return []
-        lines = move_l_obj.search(cursor, uid,
-                                  [('account_id', 'in', acc_ids),
-                                   ('date_maturity', '<=', controlling_date),
-                                   ('reconcile_id', '=', False),
-                                   ('partner_id', '!=', False)],
-                                  context=context)
-
-        return lines
-
     def _get_sum_reduce_range(self, cursor, uid, policy_id, controlling_date, lines,
                               model, move_relation_field, context=None):
         """ Get the move lines related to one model for a policy.
@@ -83,6 +64,12 @@ class CreditControlPolicy(Model):
         # MARK possible place for a good optimisation
         if context is None:
             context = {}
+
+        policy = self.browse(cursor, uid, policy_id, context=context)
+        if not policy.account_ids:
+            return []
+        account_ids = [a.id for a in policy.account_ids]
+
         my_obj = self.pool.get(model)
         move_l_obj = self.pool.get('account.move.line')
         add_lines = []
@@ -95,7 +82,8 @@ class CreditControlPolicy(Model):
                 [(move_relation_field, 'in', add_obj_ids),
                  ('date_maturity', '<=', controlling_date),
                  ('partner_id', '!=', False),
-                 ('reconcile_id', '=', False)],
+                 ('reconcile_id', '=', False),
+                 ('account_id', 'in', account_ids)],
                 context=context)
             lines = list(set(lines + add_lines))
 
@@ -113,7 +101,8 @@ class CreditControlPolicy(Model):
                     [(move_relation_field, 'in', neg_obj_ids),
                      ('date_maturity', '<=', controlling_date),
                      ('partner_id', '!=', False),
-                     ('reconcile_id', '=', False)],
+                     ('reconcile_id', '=', False),
+                     ('account_id', 'in', account_ids)],
                     context=context)
             if neg_lines:
                 lines = list(set(lines) - set(neg_lines))
@@ -145,8 +134,6 @@ class CreditControlPolicy(Model):
         if isinstance(policy_id, list):
             policy_id = policy_id[0]
         # there is a priority between the lines, depicted by the calls below
-        lines += self._get_account_related_lines(
-                cursor, uid, policy_id, controlling_date, context=context)
         # warning, side effect method called on lines
         lines = self._get_partner_related_lines(
                 cursor, uid, policy_id, controlling_date, lines, context=context)
diff --git a/account_credit_control/policy_view.xml b/account_credit_control/policy_view.xml
index 6df907471..c1c524008 100644
--- a/account_credit_control/policy_view.xml
+++ b/account_credit_control/policy_view.xml
@@ -10,9 +10,9 @@
           <field name="name"/>
           <field name="do_nothing"/>
           <field name="company_id"/>
-          <notebook  colspan="4">
+          <notebook colspan="4">
             <page string="Policy Levels">
-              <field name="level_ids" colspan="4" >
+              <field name="level_ids" nolabel="1" colspan="4" >
                 <tree  editable="bottom">
                   <field name="name"/>
                   <field name="level"/>
@@ -38,6 +38,9 @@
                 </form>
               </field>
             </page>
+            <page string="Accounts">
+              <field name="account_ids" nolabel="1"/>
+            </page>
           </notebook>
         </form>
       </field>
@@ -61,7 +64,7 @@
         id="base_credit_control_configuration_menu"/>
 
     <record model="ir.actions.act_window" id="credit_policy_configuration_action">
-      <field name="name">Credit Policies</field>
+      <field name="name">Credit Control Policies</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">credit.control.policy</field>
       <field name="domain"></field>
@@ -71,7 +74,7 @@
     </record>
 
     <menuitem
-        name="Credit Policies"
+        name="Credit Control Policies"
         parent="base_credit_control_configuration_menu"
         action="credit_policy_configuration_action"
         id="credit_policy_configuration_action_menu"/>
diff --git a/account_credit_control/run_view.xml b/account_credit_control/run_view.xml
index cdd49b401..b3a7be8ae 100644
--- a/account_credit_control/run_view.xml
+++ b/account_credit_control/run_view.xml
@@ -18,7 +18,7 @@
       <field name="model">credit.control.run</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-        <form> <!-- editable="bottom" -->
+        <form>
           <field name="date"/>
           <newline/>
           <notebook colspan="4">
@@ -28,15 +28,15 @@
             <page string="Report and Errors">
               <field name="report" colspan="4" nolabel="1"/>
               <separator string="Move lines To be treated manually"/>
-             <field name="manual_ids" colspan="4" nolabel="1"/>
+              <field name="manual_ids" colspan="4" nolabel="1"/>
             </page>
           </notebook>
           <group col="3" colspan="4">
             <button name="generate_credit_lines"
-                    string="Compute Credit Control Lines"
-                    colspan="1"
-                    type="object" icon="gtk-execute"
-                    attrs="{'invisible': [('state', '!=', 'draft')]}"/>
+              string="Compute Credit Control Lines"
+              colspan="1"
+              type="object" icon="gtk-execute"
+              attrs="{'invisible': [('state', '!=', 'draft')]}"/>
           </group>
           <field name="state"/>
         </form>