diff --git a/app/Http/Controllers/Accessories/AccessoriesController.php b/app/Http/Controllers/Accessories/AccessoriesController.php
index ae4e79bc51..00cfce0516 100755
--- a/app/Http/Controllers/Accessories/AccessoriesController.php
+++ b/app/Http/Controllers/Accessories/AccessoriesController.php
@@ -90,7 +90,12 @@ class AccessoriesController extends Controller
             $accessory = $request->handleImages($accessory);
         }
 
-        session()->put(['redirect_option' => $request->get('redirect_option')]);
+        if($request->get('redirect_option') === 'back'){
+            session()->put(['redirect_option' => 'index']);
+        } else {
+            session()->put(['redirect_option' => $request->get('redirect_option')]);
+        }
+
         // Was the accessory created?
         if ($accessory->save()) {
             // Redirect to the new accessory  page
diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php
index 440f128232..10f03db215 100755
--- a/app/Http/Controllers/Assets/AssetsController.php
+++ b/app/Http/Controllers/Assets/AssetsController.php
@@ -234,9 +234,13 @@ class AssetsController extends Controller
                 $failures[] = join(",", $asset->getErrors()->all());
             }
         }
+        if($request->get('redirect_option') === 'back'){
+            session()->put(['redirect_option' => 'index']);
+        } else {
+            session()->put(['redirect_option' => $request->get('redirect_option')]);
+        }
 
-        session()->put(['redirect_option' => $request->get('redirect_option'),
-                       'checkout_to_type' => $request->get('checkout_to_type'),
+        session()->put(['checkout_to_type' => $request->get('checkout_to_type'),
                        'other_redirect' =>  'model' ]);
 
 
diff --git a/app/Http/Controllers/Components/ComponentsController.php b/app/Http/Controllers/Components/ComponentsController.php
index 0a4a327167..ff1b0061b4 100644
--- a/app/Http/Controllers/Components/ComponentsController.php
+++ b/app/Http/Controllers/Components/ComponentsController.php
@@ -88,7 +88,12 @@ class ComponentsController extends Controller
 
         $component = $request->handleImages($component);
 
-        session()->put(['redirect_option' => $request->get('redirect_option')]);
+        if($request->get('redirect_option') === 'back'){
+            session()->put(['redirect_option' => 'index']);
+        } else {
+            session()->put(['redirect_option' => $request->get('redirect_option')]);
+        }
+
 
         if ($component->save()) {
             return Helper::getRedirectOption($request, $component->id, 'Components')
diff --git a/app/Http/Controllers/Consumables/ConsumablesController.php b/app/Http/Controllers/Consumables/ConsumablesController.php
index 802b88550d..2601b69edd 100644
--- a/app/Http/Controllers/Consumables/ConsumablesController.php
+++ b/app/Http/Controllers/Consumables/ConsumablesController.php
@@ -98,7 +98,12 @@ class ConsumablesController extends Controller
             $consumable = $request->handleImages($consumable);
         }
 
-        session()->put(['redirect_option' => $request->get('redirect_option')]);
+        if($request->get('redirect_option') === 'back'){
+            session()->put(['redirect_option' => 'index']);
+        } else {
+            session()->put(['redirect_option' => $request->get('redirect_option')]);
+        }
+
 
         if ($consumable->save()) {
             return Helper::getRedirectOption($request, $consumable->id, 'Consumables')
diff --git a/app/Http/Controllers/Licenses/LicensesController.php b/app/Http/Controllers/Licenses/LicensesController.php
index 37d30af6ac..d67f2a0be1 100755
--- a/app/Http/Controllers/Licenses/LicensesController.php
+++ b/app/Http/Controllers/Licenses/LicensesController.php
@@ -102,7 +102,11 @@ class LicensesController extends Controller
         $license->created_by           = auth()->id();
         $license->min_amt           = $request->input('min_amt');
 
-        session()->put(['redirect_option' => $request->get('redirect_option')]);
+        if($request->get('redirect_option') === 'back'){
+            session()->put(['redirect_option' => 'index']);
+        } else {
+            session()->put(['redirect_option' => $request->get('redirect_option')]);
+        }
 
         if ($license->save()) {
             return Helper::getRedirectOption($request, $license->id, 'Licenses')
diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php
index 2bfdf06d23..a0115bdc96 100755
--- a/app/Http/Controllers/Users/UsersController.php
+++ b/app/Http/Controllers/Users/UsersController.php
@@ -126,7 +126,12 @@ class UsersController extends Controller
         // we have to invoke the form request here to handle image uploads
         app(ImageUploadRequest::class)->handleImages($user, 600, 'avatar', 'avatars', 'avatar');
 
-        session()->put(['redirect_option' => $request->get('redirect_option')]);
+        if($request->get('redirect_option') === 'back'){
+            session()->put(['redirect_option' => 'index']);
+        } else {
+            session()->put(['redirect_option' => $request->get('redirect_option')]);
+        }
+
 
         if ($user->save()) {
             if ($request->filled('groups')) {
diff --git a/resources/views/accessories/edit.blade.php b/resources/views/accessories/edit.blade.php
index 827e117b51..86015b7643 100644
--- a/resources/views/accessories/edit.blade.php
+++ b/resources/views/accessories/edit.blade.php
@@ -6,6 +6,7 @@
     'formAction' => (isset($item->id)) ? route('accessories.update', ['accessory' => $item->id]) : route('accessories.store'),
     'index_route' => 'accessories.index',
     'options' => [
+                'back' => trans('admin/hardware/form.redirect_to_type',['type' => trans('general.previous_page')]),
                 'index' => trans('admin/hardware/form.redirect_to_all', ['type' => 'accessories']),
                 'item' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.accessory')]),
                ]
diff --git a/resources/views/components/edit.blade.php b/resources/views/components/edit.blade.php
index 71ecbffd51..b9a393f1d1 100644
--- a/resources/views/components/edit.blade.php
+++ b/resources/views/components/edit.blade.php
@@ -1,13 +1,3 @@
-@php
-    $options = [
-        'index' => trans('admin/hardware/form.redirect_to_all', ['type' => 'components']),
-        'item' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.component')]),
-    ];
-    if (Route::currentRouteName() !== 'components.create') {
-        $options['back'] = trans('admin/hardware/form.redirect_to_type',['type' => trans('general.previous_page')]);
-    }
-@endphp
-
 @extends('layouts/edit-form', [
     'createText' => trans('admin/components/general.create') ,
     'updateText' => trans('admin/components/general.update'),
@@ -15,7 +5,12 @@
     'helpText' => trans('help.components'),
     'formAction' => (isset($item->id)) ? route('components.update', ['component' => $item->id]) : route('components.store'),
     'index_route' => 'components.index',
-    'options' => $options,
+    'options' => [
+                'back' => trans('admin/hardware/form.redirect_to_type',['type' => trans('general.previous_page')]),
+                'index' => trans('admin/hardware/form.redirect_to_all', ['type' => 'components']),
+                'item' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.component')]),
+               ]
+
 ])
 
 {{-- Page content --}}
diff --git a/resources/views/consumables/edit.blade.php b/resources/views/consumables/edit.blade.php
index 380324bb0d..5b8dd736c6 100644
--- a/resources/views/consumables/edit.blade.php
+++ b/resources/views/consumables/edit.blade.php
@@ -1,13 +1,3 @@
-@php
-    $options = [
-        'index' => trans('admin/hardware/form.redirect_to_all', ['type' => 'consumables']),
-        'item' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.consumable')]),
-    ];
-    if (Route::currentRouteName() !== 'consumables.create') {
-        $options['back'] = trans('admin/hardware/form.redirect_to_type',['type' => trans('general.previous_page')]);
-    }
-@endphp
-
 @extends('layouts/edit-form', [
     'createText' => trans('admin/consumables/general.create') ,
     'updateText' => trans('admin/consumables/general.update'),
@@ -15,7 +5,11 @@
     'helpText' => trans('help.consumables'),
     'formAction' => (isset($item->id)) ? route('consumables.update', ['consumable' => $item->id]) : route('consumables.store'),
     'index_route' => 'consumables.index',
-    'options' => $options,
+    'options' => [
+                'back' => trans('admin/hardware/form.redirect_to_type',['type' => trans('general.previous_page')]),
+                'index' => trans('admin/hardware/form.redirect_to_all', ['type' => 'consumables']),
+                'item' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.consumable')]),
+               ]
 ])
 {{-- Page content --}}
 @section('inputFields')
diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php
index 09051bf8d7..58f920e5b6 100755
--- a/resources/views/hardware/edit.blade.php
+++ b/resources/views/hardware/edit.blade.php
@@ -1,13 +1,3 @@
-@php
-    $options = [
-        'index' => trans('admin/hardware/form.redirect_to_all', ['type' => 'assets']),
-        'item' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.asset')]),
-        'other_redirect' => trans('admin/hardware/form.redirect_to_type', [ 'type' => trans('general.asset') . ' ' . trans('general.asset_model')]),
-    ];
-    if (Route::currentRouteName() !== 'hardware.create') {
-        $options['back'] = trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.previous_page')]);
-    }
-@endphp
 
 @extends('layouts/edit-form', [
     'createText' => trans('admin/hardware/form.create'),
@@ -17,7 +7,12 @@
     'helpPosition' => 'right',
     'formAction' => ($item->id) ? route('hardware.update', $item) : route('hardware.store'),
     'index_route' => 'hardware.index',
-    'options' => $options,
+    'options' => [
+                'back' => trans('admin/hardware/form.redirect_to_type',['type' => trans('general.previous_page')]),
+                'index' => trans('admin/hardware/form.redirect_to_all', ['type' => 'assets']),
+                'item' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.asset')]),
+                'other_redirect' => trans('admin/hardware/form.redirect_to_type', [ 'type' => trans('general.asset').' '.trans('general.asset_model')]),
+               ]
 ])
 
 
diff --git a/resources/views/licenses/edit.blade.php b/resources/views/licenses/edit.blade.php
index ffb72cf5d4..87b0180216 100755
--- a/resources/views/licenses/edit.blade.php
+++ b/resources/views/licenses/edit.blade.php
@@ -1,20 +1,14 @@
-@php
-    $options = [
-        'index' => trans('admin/hardware/form.redirect_to_all', ['type' => 'licenses']),
-        'item' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.license')]),
-    ];
-    if (Route::currentRouteName() !== 'licenses.create') {
-        $options['back'] = trans('admin/hardware/form.redirect_to_type',['type' => trans('general.previous_page')]);
-    }
-@endphp
-
 @extends('layouts/edit-form', [
     'createText' => trans('admin/licenses/form.create'),
     'updateText' => trans('admin/licenses/form.update'),
     'topSubmit' => true,
     'formAction' => ($item->id) ? route('licenses.update', ['license' => $item->id]) : route('licenses.store'),
      'index_route' => 'licenses.index',
-    'options' => $options,
+    'options' => [
+                'back' => trans('admin/hardware/form.redirect_to_type',['type' => trans('general.previous_page')]),
+                'index' => trans('admin/hardware/form.redirect_to_all', ['type' => 'licenses']),
+                'item' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.license')]),
+               ]
 ])
 
 {{-- Page content --}}
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 0139084ebe..25dd799177 100755
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -639,12 +639,11 @@
           <x-redirect_submit_options
                   index_route="users.index"
                   :button_label="trans('general.save')"
-                  :options="array_filter([
-                    Route::currentRouteName() !== 'users.create' ?
-                        ['back' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.previous_page')])] : null,
+                  :options="[
+                        'back' => trans('admin/hardware/form.redirect_to_type',['type' => trans('general.previous_page')]),
                         'index' => trans('admin/hardware/form.redirect_to_all', ['type' => 'users']),
                         'item' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.user')]),
-                    ])"
+                        ]"
           />
       </div><!-- nav-tabs-custom -->
     </form>