diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php
index 9fc5bf90a3..7980e22fe1 100644
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -1543,11 +1543,6 @@ class Helper
 
        // return to previous page
         if ($redirect_option === 'back') {
-            if ($backUrl === route('home')) {
-                return redirect()->to($backUrl)
-                ->with('warning', trans('general.page_error'));
-             }
-
             return redirect()->to($backUrl);
         }
 
diff --git a/resources/views/components/edit.blade.php b/resources/views/components/edit.blade.php
index b9a393f1d1..71ecbffd51 100644
--- a/resources/views/components/edit.blade.php
+++ b/resources/views/components/edit.blade.php
@@ -1,3 +1,13 @@
+@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'),
@@ -5,12 +15,7 @@
     'helpText' => trans('help.components'),
     'formAction' => (isset($item->id)) ? route('components.update', ['component' => $item->id]) : route('components.store'),
     'index_route' => 'components.index',
-    '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')]),
-               ]
-
+    'options' => $options,
 ])
 
 {{-- Page content --}}
diff --git a/resources/views/consumables/edit.blade.php b/resources/views/consumables/edit.blade.php
index 5b8dd736c6..380324bb0d 100644
--- a/resources/views/consumables/edit.blade.php
+++ b/resources/views/consumables/edit.blade.php
@@ -1,3 +1,13 @@
+@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'),
@@ -5,11 +15,7 @@
     'helpText' => trans('help.consumables'),
     'formAction' => (isset($item->id)) ? route('consumables.update', ['consumable' => $item->id]) : route('consumables.store'),
     'index_route' => 'consumables.index',
-    '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')]),
-               ]
+    'options' => $options,
 ])
 {{-- Page content --}}
 @section('inputFields')
diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php
index 58f920e5b6..09051bf8d7 100755
--- a/resources/views/hardware/edit.blade.php
+++ b/resources/views/hardware/edit.blade.php
@@ -1,3 +1,13 @@
+@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'),
@@ -7,12 +17,7 @@
     'helpPosition' => 'right',
     'formAction' => ($item->id) ? route('hardware.update', $item) : route('hardware.store'),
     'index_route' => 'hardware.index',
-    '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')]),
-               ]
+    'options' => $options,
 ])
 
 
diff --git a/resources/views/licenses/edit.blade.php b/resources/views/licenses/edit.blade.php
index 87b0180216..ffb72cf5d4 100755
--- a/resources/views/licenses/edit.blade.php
+++ b/resources/views/licenses/edit.blade.php
@@ -1,14 +1,20 @@
+@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' => [
-                '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')]),
-               ]
+    'options' => $options,
 ])
 
 {{-- Page content --}}
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 25dd799177..0139084ebe 100755
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -639,11 +639,12 @@
           <x-redirect_submit_options
                   index_route="users.index"
                   :button_label="trans('general.save')"
-                  :options="[
-                        'back' => trans('admin/hardware/form.redirect_to_type',['type' => trans('general.previous_page')]),
+                  :options="array_filter([
+                    Route::currentRouteName() !== 'users.create' ?
+                        ['back' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.previous_page')])] : null,
                         '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>