diff --git a/apps/user/templates/user/notification-settings.html b/apps/user/templates/user/notification-settings.html
index f2688060..40c679e5 100644
--- a/apps/user/templates/user/notification-settings.html
+++ b/apps/user/templates/user/notification-settings.html
@@ -2,7 +2,7 @@
 <div class="section section_gray section_menu">
   <div class="section__center center center_xs">
     <div class="menu">
-      <a class="menu__link" href="{% url 'user-edit-profile' user.id %}">Профиль</a>
+      <a class="menu__link" href="{% url 'user-edit-profile' %}">Профиль</a>
       <a class="menu__link active" href="{% url 'user-edit-notifications' user.id %}">Уведомления</a>
       <a class="menu__link" href="{% url 'user-edit-payments' user.id %}">Платежи</a>
     </div>
diff --git a/apps/user/templates/user/payment-history.html b/apps/user/templates/user/payment-history.html
index 5643dfa5..c27a3faa 100644
--- a/apps/user/templates/user/payment-history.html
+++ b/apps/user/templates/user/payment-history.html
@@ -2,7 +2,7 @@
 <div class="section section_gray section_menu">
   <div class="section__center center center_xs">
     <div class="menu">
-      <a class="menu__link" href="{% url 'user-edit-profile' user.id %}">Профиль</a>
+      <a class="menu__link" href="{% url 'user-edit-profile' %}">Профиль</a>
       <a class="menu__link" href="{% url 'user-edit-notifications' user.id %}">Уведомления</a>
       <a class="menu__link active" href="{% url 'user-edit-payments' user.id %}">Платежи</a>
     </div>
diff --git a/apps/user/templates/user/profile-settings.html b/apps/user/templates/user/profile-settings.html
index f590c7f9..5502c21d 100644
--- a/apps/user/templates/user/profile-settings.html
+++ b/apps/user/templates/user/profile-settings.html
@@ -2,7 +2,7 @@
 <div class="section section_gray section_menu">
   <div class="section__center center center_xs">
     <div class="menu">
-      <a class="menu__link active" href="{% url 'user-edit-profile' user.id %}">Профиль</a>
+      <a class="menu__link active" href="{% url 'user-edit-profile' %}">Профиль</a>
       <a class="menu__link" href="{% url 'user-edit-notifications' user.id %}">Уведомления</a>
       <a class="menu__link" href="{% url 'user-edit-payments' user.id %}">Платежи</a>
     </div>
diff --git a/apps/user/views.py b/apps/user/views.py
index abbd2e4d..da1245ae 100644
--- a/apps/user/views.py
+++ b/apps/user/views.py
@@ -41,7 +41,7 @@ def resend_email_verify(request):
     url = request.scheme + '://' + request.get_host() + str(reverse_lazy('lilcity:verification-email', args=[token, request.user.id]))
     send_email('Вы успешно прошли регистрацию', request.user.email, "notification/email/verification_email.html", url=url)
     messages.info(request, 'Письмо подтверждения отправлено.')
-    return redirect('user-edit-profile', request.user.id)
+    return redirect('user-edit-profile')
 
 
 @method_decorator(login_required, name='dispatch')
@@ -200,13 +200,16 @@ class PaymentHistoryView(FormView):
 
 
 @method_decorator(login_required, name='dispatch')
-class UserEditView(UpdateView):
+class ProfileEditView(UpdateView):
     model = User
     template_name = 'user/profile-settings.html'
     form_class = UserEditForm
 
+    def get_object(self, queryset=None):
+        return self.request.user
+
     def dispatch(self, request, *args, **kwargs):
-        self.object = request.user
+        self.object = self.get_object()
         return super().dispatch(request, *args, **kwargs)
 
     def post(self, request, *args, **kwargs):
@@ -252,7 +255,7 @@ class UserEditView(UpdateView):
         return super().post(request, *args, **kwargs)
 
     def get_success_url(self):
-        return reverse('user-edit-profile', args=[self.object.id])
+        return reverse('user-edit-profile')
 
 
 class AuthorRequestView(FormView):
diff --git a/project/templates/blocks/user_menu.html b/project/templates/blocks/user_menu.html
index e1bc7d57..95e2b7d3 100644
--- a/project/templates/blocks/user_menu.html
+++ b/project/templates/blocks/user_menu.html
@@ -1,7 +1,7 @@
 {% load static %} {% load thumbnail %}
 {% if request.user.is_authenticated %}
 <div class="header__login">
-  <a class="header__ava ava" href="{% if request.user_agent.is_touch_capable %}#{% else %}{% url 'user' request.user.id %}{% endif %}">
+  <a class="header__ava ava" href="{% if request.user_agent.is_touch_capable %}#{% else %}{% url 'user-profile' %}{% endif %}">
     {% thumbnail request.user.photo "48x48" crop="center" as im %}
     <img class="ava__pic" src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" />
     {% empty %}
diff --git a/project/urls.py b/project/urls.py
index d24d6487..01273848 100644
--- a/project/urls.py
+++ b/project/urls.py
@@ -27,7 +27,7 @@ from apps.course.views import (
 )
 from apps.user.views import (
     AuthorRequestView, UserView,
-    UserEditView, NotificationEditView,
+    ProfileEditView, NotificationEditView,
     PaymentHistoryView, resend_email_verify,
     SubscribeView, ProfileView,
 )
@@ -68,7 +68,7 @@ urlpatterns = [
     path('school/checkout', SchoolBuyView.as_view(), name='school-checkout'),
     path('search/', SearchView.as_view(), name='search'),
     path('user/profile/', ProfileView.as_view(), name='user-profile'),
-    path('user/profile/edit', UserEditView.as_view(), name='user-edit-profile'),
+    path('user/profile/edit', ProfileEditView.as_view(), name='user-edit-profile'),
     path('user/<int:pk>/', UserView.as_view(), name='user'),
     path('user/<int:pk>/notifications', NotificationEditView.as_view(), name='user-edit-notifications'),
     path('user/<int:pk>/payments', PaymentHistoryView.as_view(), name='user-edit-payments'),