diff --git a/AuthApp/forms.py b/AuthApp/forms.py
index c66debf..498fa5a 100644
--- a/AuthApp/forms.py
+++ b/AuthApp/forms.py
@@ -34,9 +34,9 @@ class RegistrationForm(forms.Form):
         i = 0
         names = list(cleaned_data.keys())
         while i < len(names):
-        # for name, val in cleaned_data.items():
             if not cleaned_data[names[i]]:
-                self.add_error(names[i], _('Обязательное поле'))
+                if self.fields[names[i]].required:
+                    self.add_error(names[i], _('Обязательное поле'))
             i += 1
 
         if cleaned_data and 'confirm_password' in cleaned_data and 'password' in cleaned_data:
diff --git a/templates/widgets/w_message.html b/templates/widgets/w_message.html
index b7a32b0..d5244aa 100644
--- a/templates/widgets/w_message.html
+++ b/templates/widgets/w_message.html
@@ -8,15 +8,8 @@
         </div>
         <div class="block_text_message {% get_msg_side user ticket msg %}">
             <div class="container_text_message {% get_msg_side user ticket msg %}">
-                {% if msg.text %}
-                    <span class="text_message">
-                        {{ msg.text }}
-                    </span>
-                {% elif ticket %}
-                    <span class="text_message">
-                        {{ ticket.text }}
-                    </span>
-                {% elif msg.files %}
+
+                {% if msg.files %}
                     {% for file in msg.files %}
                         <div class="file_border_cont {{ msg.id }}_ident">
                             <div class="left_part_file_w">
@@ -29,6 +22,15 @@
                             <div class="clear_both"></div>
                         </div>
                     {% endfor %}
+
+                {% elif msg.text %}
+                    <span class="text_message">
+                        {{ msg.text }}
+                    </span>
+                {% elif ticket and ticket.text %}
+                    <span class="text_message">
+                        {{ ticket.text }}
+                    </span>
                 {% endif %}
             </div>
             <div class="data_send_message {% get_msg_side user ticket msg %}">