From da5a1fe26478459bf6031334be3fafd0244c69ba Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Wed, 17 Oct 2018 06:05:19 +0200
Subject: [PATCH] Fix for #1785

---
 app/Support/Http/Controllers/UserNavigation.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/Support/Http/Controllers/UserNavigation.php b/app/Support/Http/Controllers/UserNavigation.php
index f6bcd2ddf3..3119328c52 100644
--- a/app/Support/Http/Controllers/UserNavigation.php
+++ b/app/Support/Http/Controllers/UserNavigation.php
@@ -28,6 +28,7 @@ use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Http\RedirectResponse;
+use Illuminate\Support\ViewErrorBag;
 use Log;
 use URL;
 
@@ -141,6 +142,10 @@ trait UserNavigation
      */
     protected function rememberPreviousUri(string $identifier): void
     {
-        session()->put($identifier, URL::previous());
+        /** @var ViewErrorBag $errors */
+        $errors = session()->get('errors');
+        if(null === $errors || (null !== $errors && 0=== $errors->count())) {
+            session()->put($identifier, URL::previous());
+        }
     }
 }
\ No newline at end of file