diff --git a/hosting/templates/hosting/includes/_messages.html b/hosting/templates/hosting/includes/_messages.html
index b261a512..12540558 100644
--- a/hosting/templates/hosting/includes/_messages.html
+++ b/hosting/templates/hosting/includes/_messages.html
@@ -1,7 +1,7 @@
 {% if messages %}
     <ul class="list-unstyled msg-list">
     {% for message in messages %}
-        <div class="alert {% if message.tags and message.tags == 'error' or  message.tags and message.tags == 'vat_error' %} alert-danger {% else %} alert-{{message.tags}} {% endif %}">{{ message|safe }}</div>
+        <div class="alert {% if message.tags and message.tags == 'error' %} alert-danger {% else %} alert-{{message.tags}} {% endif %}">{{ message|safe }}</div>
     {% endfor %}
     </ul>
 {% endif %}
\ No newline at end of file
diff --git a/hosting/views.py b/hosting/views.py
index aeca6ada..17c3fb5e 100644
--- a/hosting/views.py
+++ b/hosting/views.py
@@ -644,7 +644,7 @@ class SettingsView(LoginRequiredMixin, FormView):
                         messages.add_message(
                             request, messages.ERROR,
                             "VAT Number validation error: %s" % validate_result["error"],
-                            extra_tags='vat_error'
+                            extra_tags='error'
                         )
                     else:
                         msg = _("Billing address updated successfully")