diff --git a/ext/custom-addons/dp_custom/models/res_partner.py b/ext/custom-addons/dp_custom/models/res_partner.py
index 29ebe1e6..cd5247da 100644
--- a/ext/custom-addons/dp_custom/models/res_partner.py
+++ b/ext/custom-addons/dp_custom/models/res_partner.py
@@ -90,13 +90,16 @@ class Partner(models.Model):
                 date_today = fields.Date.from_string(fields.Date.context_today(self))
                 warn_date = date_today - relativedelta(months=+3)
                 try:
-                    # if record.date_vat_check < '2000-01-01':
-                    #     record.date_vat_check = '2000-01-01'
                     check_date = dateutil.parser.parse(record.date_vat_check).date()
                 except:
                     check_date = date_today - relativedelta(months=+36)
                 if check_date < warn_date:
                     record.warn_vat_date = True
+                else:
+                    record.warn_vat_date = False
+            else:
+                record.warn_vat_date = True
+
 
     @api.multi
     def action_check_vat(self):
@@ -104,11 +107,12 @@ class Partner(models.Model):
             if record.vat:
                 vat_country, vat_number = self._split_vat(record.vat)
                 try:
-                    result = stdnum_vat.check_vies_approx(vat_country+vat_number,"ATU54619104")
+                    my_vat = self.self.env.user.company_id.vat
+                    my_vat = my_vat.replace(' ','')
+                    result = stdnum_vat.check_vies_approx(vat_country+vat_number,my_vat)
                 except Exception as ex:
                     # Avoid blocking the client when the service is unreachable/unavailable
-                    raise Warning(
-                        _("UID-Prüfung: %s Service ist nicht verfügbar") % record.vat)
+                    raise ValidationError("UID-Prüfung: %s, Service ist nicht verfügbar - %s" % (record.vat,ex))
                     return {}
 
                 if not result['valid']: