diff --git a/application/forms.py b/application/forms.py
index 54503d9..3311509 100644
--- a/application/forms.py
+++ b/application/forms.py
@@ -6,7 +6,7 @@ from django.contrib.auth.forms import UserCreationForm, UserChangeForm
 class PostForm(forms.ModelForm):
     class Meta:
         model = Post
-        fields = ('title', 'text', 'published_date', 'tags')
+        fields = ('title', 'text', 'published_date','tags')
 
 class NewTagForm(forms.ModelForm):
     m_tags = TagField()
diff --git a/application/models.py b/application/models.py
index c447e8c..bddbb8f 100644
--- a/application/models.py
+++ b/application/models.py
@@ -4,7 +4,7 @@ from django.utils import timezone
 from taggit.managers import TaggableManager
 
 class CustomUser(models.Model):
-    user = models.OneToOneField(User, null = True, on_delete=models.CASCADE)
+    user = models.OneToOneField('auth.User', null = True, on_delete=models.CASCADE)
     tags = TaggableManager()
 
 
diff --git a/application/urls.py b/application/urls.py
index d1bdc59..f983477 100644
--- a/application/urls.py
+++ b/application/urls.py
@@ -13,6 +13,6 @@ urlpatterns = [
     url(r'^drafts/$', views.post_draft_list, name='post_draft_list'),
     url(r'^post/(?P<pk>\d+)/publish/$', views.post_publish, name='post_publish'),
     url(r'^post/(?P<pk>\d+)/remove/$', views.post_remove, name='post_remove'),
-        url(r'^tags/', include('taggit_templatetags2.urls')),
+    url(r'^tags/', include('taggit_templatetags2.urls')),
 ]
 
diff --git a/application/views.py b/application/views.py
index acbe4f2..33f2c93 100644
--- a/application/views.py
+++ b/application/views.py
@@ -79,6 +79,7 @@ def post_edit(request, pk):
             post = form.save(commit=False)
             post.author = request.user
             post.save()
+            form.save_m2m()
             return redirect('post_detail', pk=post.pk)
     else:
         form = PostForm(instance=post)