diff --git a/clientsideapp/templates/clientsideapp/services.html b/clientsideapp/templates/clientsideapp/services.html
index beb729b..bb6f623 100644
--- a/clientsideapp/templates/clientsideapp/services.html
+++ b/clientsideapp/templates/clientsideapp/services.html
@@ -74,7 +74,9 @@
                     </div>
                 </div>
             </div>
-            {% include 'clientsideapp/custom_pages/service.htm' with active_service=current_service %}
+            {% if current_service %}
+                {% include 'clientsideapp/custom_pages/service.htm' with active_service=current_service %}
+            {% endif %}
         </div>
     </div>
 
diff --git a/taskapp/views.py b/taskapp/views.py
index ea1eebb..9f10308 100644
--- a/taskapp/views.py
+++ b/taskapp/views.py
@@ -141,8 +141,6 @@ class TaskUpdateView(UpdateView):
     def form_valid(self, form):
         try:
             self.object = form.save()
-            self.object.author = self.request.user
-            self.object.save(update_fields=['author'])
             task_id = safe_int(self.kwargs.get('task_id', 0))
             if task_id == 0:
                 log_text = _('Task has successfully created')