diff --git a/apps/base/views.py b/apps/base/views.py
index bf18504..08f9895 100644
--- a/apps/base/views.py
+++ b/apps/base/views.py
@@ -56,9 +56,9 @@ def complete_profile(request):
 
 
 def login(request):
+    next = request.GET.get('next', reverse('home'))
     if request.user.is_authenticated:
         return HttpResponseRedirect(reverse('home'))
-    next = request.GET.get('next', reverse('home'))
 
     if request.method == 'POST':
         form = SignInForm(request.POST)
@@ -66,6 +66,9 @@ def login(request):
             cd = form.cleaned_data
             user = form.user
             dj_login(request, user)
+            next = request.POST.get('next')
+            if next == None:
+                next = request.GET.get('next', reverse('home'))
             return HttpResponseRedirect(next)
     else:
         form = SignInForm()
diff --git a/apps/locker/templates/locker.html b/apps/locker/templates/locker.html
index d988f2e..a15b805 100644
--- a/apps/locker/templates/locker.html
+++ b/apps/locker/templates/locker.html
@@ -122,6 +122,9 @@ <h2 class="mb-4 mx-2 px-4 text-white border-right-white">رزرو کمد</h2>
                                         تحویل آن و مطابق
                                         بندهای فوق مبلغ 35 هزار تومان به شما بازگردانده خواهد شد.
                                     </li>
+                                    <li>
+                                    پس از دریافت کمد به هر دلیلی اگر پرداخت شما صحیح نباشد کمد پس از مدتی از شما پس گرفته می شود.
+                                    </li>
                                 </ol>
                             </div>
                         </div>
diff --git a/apps/locker/views.py b/apps/locker/views.py
index bd3aa99..b695992 100644
--- a/apps/locker/views.py
+++ b/apps/locker/views.py
@@ -87,7 +87,7 @@ def add_new(request):
 def payment(request, rack_id):
     Rack = get_object_or_404(rack, id=rack_id)
     if request.method == "POST":
-        if Rack.payment==True:
+        if Rack.payment==True and Rack.receiver != request.user:
             return HttpResponse('someone else is on payment for this locker')
         moneyt = 40000
         Sell = sell(value=moneyt, locker=Rack, is_success=False)
diff --git a/templates/base_of_new_website.html b/templates/base_of_new_website.html
index 02034f9..aa81eba 100644
--- a/templates/base_of_new_website.html
+++ b/templates/base_of_new_website.html
@@ -79,6 +79,9 @@ <h4 class="modal-title ml-auto">ورود</h4>
                         <input class="custom-control-input" type="checkbox" id="remember-me">
                         <label class="custom-control-label" for="remember-me"> مرا به خاطر بسپار </label>
                     </div>
+                    <div>
+                      <input type="hidden" name="next" value="{{request.path}}">
+                    </div>
                     <div class="form-group">
                         <button type="submit" class="btn btn-primary">برو!</button>
                         <a role="button" class="btn btn-outline-primary" href="{% url 'password_reset_recover' %}">فراموشی