diff --git a/core/forms.py b/core/forms.py
index a920499..54724a2 100644
--- a/core/forms.py
+++ b/core/forms.py
@@ -28,8 +28,8 @@ USERNAME_REGEX_FIELD = forms.RegexField(
     max_length=50,
     regex=r'^[a-zA-Z0-9-_@]+$',
     error_messages={
-        'required': _('Please enter your name'),
-        'invalid': _('Alphanumeric characters and underscores and dashes only (a-z, 0-9, _, -, @)')
+        'required': _('Please enter a username'),
+        'invalid': _('Username can only have alphanumeric characters and underscores and dashes (a-z, 0-9, _, -, @)')
     },
     widget=forms.TextInput(
         attrs={'placeholder': _('Username'), 'class': 'input input-bordered w-full'}),
@@ -55,20 +55,20 @@ class RegisterForm(forms.Form):
 
         if password != password_confirm:
             raise forms.ValidationError(
-                "password and password_confirm does not match"
+                "Password and Confirm Password do not match."
             )
         if len(password) < 10:
             raise forms.ValidationError(
-                "password must be at least 10 characters long"
+                "Password must be at least 10 characters long."
             )
 
         if PawUser.objects.filter(username=cleaned_data.get("username")).exists():
             raise forms.ValidationError(
-                "An account with this username already exists"
+                "An account with this username already exists."
             )
         if PawUser.objects.filter(email=cleaned_data.get("email")).exists():
             raise forms.ValidationError(
-                "An account with this email already exists"
+                "An account with this email already exists."
             )
         return cleaned_data
 
diff --git a/paw/__init__.py b/paw/__init__.py
index 71a898a..d635a5f 100644
--- a/paw/__init__.py
+++ b/paw/__init__.py
@@ -1,5 +1,5 @@
 from django import get_version
 
-VERSION = (0, 5, 8, "final", 0)
+VERSION = (0, 5, 9, "final", 0)
 
 __version__ = get_version(VERSION)
diff --git a/paw/templates/core/account_finish.html b/paw/templates/core/account_finish.html
index b588893..f8f3b0f 100644
--- a/paw/templates/core/account_finish.html
+++ b/paw/templates/core/account_finish.html
@@ -10,17 +10,21 @@
     <h1 class="text-3xl font-bold p-2">{% trans 'Register a new account' %}</h1>
     <div class="bg-base-200 rounded p-8">
         <ul class="steps w-full mb-6">
-            <li class="step step-accent">{% trans 'Authenticate' %}</li>
-            <li class="step step-accent">{% trans 'Set up account' %}</li>
-            <li class="step step-success">{% trans 'Done' %}</li>
-          </ul>
+          <li class="step step-accent">{% trans 'Authenticate' %}</li>
+          <li class="step step-accent">{% trans 'Set up account' %}</li>
+          <li class="step step-success">{% trans 'Done' %}</li>
+        </ul>
       <form method="post">
         {% csrf_token %}
 
-        {% if form.non_field_errors %}
+        {% if form.errors %}
         <div role="alert" class="alert alert-error mb-4">
           <svg xmlns="http://www.w3.org/2000/svg" class="hidden sm:block stroke-current shrink-0 h-6 w-6" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M10 10l4 4m0 -4l-4 4" /><path d="M12 3c7.2 0 9 1.8 9 9s-1.8 9 -9 9s-9 -1.8 -9 -9s1.8 -9 9 -9z" /></svg>
-          <span>{{ form.non_field_errors }}</span>
+            <ul>
+              {% for error in form.non_field_errors|add:form.username.errors %}
+              <li>{{ error }}</li>
+              {% endfor %}
+            </ul>
         </div>
         {% endif %}
 
diff --git a/paw/templates/core/register.html b/paw/templates/core/register.html
index 557ab23..3df2012 100644
--- a/paw/templates/core/register.html
+++ b/paw/templates/core/register.html
@@ -8,10 +8,14 @@
     <form method="post">
       {% csrf_token %}
 
-      {% if form.non_field_errors %}
+      {% if form.errors %}
       <div role="alert" class="alert alert-error mb-4">
         <svg xmlns="http://www.w3.org/2000/svg" class="hidden sm:block stroke-current shrink-0 h-6 w-6" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M10 10l4 4m0 -4l-4 4" /><path d="M12 3c7.2 0 9 1.8 9 9s-1.8 9 -9 9s-9 -1.8 -9 -9s1.8 -9 9 -9z" /></svg>
-        <span>{{ form.non_field_errors }}</span>
+          <ul>
+            {% for error in form.non_field_errors|add:form.username.errors %}
+            <li>{{ error }}</li>
+            {% endfor %}
+          </ul>
       </div>
       {% endif %}
 
diff --git a/paw/templates/partials/ticket_priority_badge.html b/paw/templates/partials/ticket_priority_badge.html
index c912d93..159c60c 100644
--- a/paw/templates/partials/ticket_priority_badge.html
+++ b/paw/templates/partials/ticket_priority_badge.html
@@ -1,4 +1,5 @@
 {% block ticket_priority_badge %}
+{% load i18n %}
     {% if ticket.priority == 3 %}
     <span class="badge badge-success join-item">{% trans 'Low' %}</span>
     {% elif ticket.priority == 2 %}