diff --git a/exceptions.py b/exceptions.py
index 4b2311e..c3119ff 100644
--- a/exceptions.py
+++ b/exceptions.py
@@ -36,39 +36,6 @@ class PayrollValidationError(UserError):
 class PeriodValidationError(UserError):
     pass
 
+
 class MissingConfigPosition(UserError):
     pass
-# class DontWriteAccountError(UserError):
-#     pass
-#
-#
-# class MissingInvoiceTaxError(UserError):
-#     pass
-#
-#
-# class InvoiceDuplicatedError(UserError):
-#     pass
-#
-#
-# class NotificationAuthError(UserError):
-#     pass
-#
-#
-# class NotificationAuthWarning(UserWarning):
-#     pass
-#
-#
-# class AuthExpiredError(UserError):
-#     pass
-#
-#
-# class InvalidTypeInvoiceError(UserError):
-#     pass
-#
-#
-# class ImportMoveDataError(UserError):
-#     pass
-
-
-# class AccountMoveCreatedError(UserWarning):
-#     pass
diff --git a/wage_type.py b/wage_type.py
index 5d451e7..a269f3d 100644
--- a/wage_type.py
+++ b/wage_type.py
@@ -47,21 +47,22 @@ class WageType(ModelSQL, ModelView):
             })
     debit_account = fields.Many2One('account.account',
             'Debit Account', domain=[
-                ('kind', 'in', ['expense', 'payable', 'receivable']),
-                ('company', '=', Eval('context', {}).get('company', 0))],
+                ('company', '=', Eval('context', {}).get('company', 0)),
+                ('type', '!=', None),
+                ],
             states={
                 'invisible': ~Eval('context', {}).get('company'),
             })
     credit_account = fields.Many2One('account.account',
             'Credit Account', domain=[
-                ('kind', 'in', ['expense', 'payable', 'receivable']),
+                ('type', '!=', None),
                 ('company', '=', Eval('context', {}).get('company', 0))],
             states={
                 'invisible': ~Eval('context', {}).get('company'),
                 })
     deduction_account = fields.Many2One('account.account',
             'Deduction Account', domain=[
-                ('kind', '!=', 'view'),
+                ('type', '!=', None),
                 ('company', '=', Eval('context', {}).get('company', 0))],
             states={
                 'invisible': Eval('definition') == 'payment',