diff --git a/djing/settings.py b/djing/settings.py
index 088c7a5..3c836a1 100644
--- a/djing/settings.py
+++ b/djing/settings.py
@@ -154,8 +154,9 @@ if DEBUG:
 # Example output: 16 september 2018
 DATE_FORMAT = 'd E Y'
 
-MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
 MEDIA_URL = '/media/'
+if DEBUG:
+    MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
 
 DEFAULT_PICTURE = '/static/img/user_ava.gif'
 AUTH_USER_MODEL = 'accounts_app.UserProfile'
diff --git a/taskapp/views.py b/taskapp/views.py
index 5d2c173..a474824 100644
--- a/taskapp/views.py
+++ b/taskapp/views.py
@@ -137,7 +137,9 @@ class TaskUpdateView(UpdateView):
 
     def form_valid(self, form):
         try:
-            self.object = form.save()
+            self.object = form.save(commit=False)
+            self.object.author = self.request.user
+            self.object.save()
             task_id = safe_int(self.kwargs.get('task_id', 0))
             if task_id == 0:
                 log_text = _('Task has successfully created')