diff --git a/admin/src/components/NotFoundPage.spec.js b/admin/src/components/NotFoundPage.spec.js
index 709b24807..99eef569b 100644
--- a/admin/src/components/NotFoundPage.spec.js
+++ b/admin/src/components/NotFoundPage.spec.js
@@ -3,11 +3,15 @@ import NotFoundPage from './NotFoundPage'
 
 const localVue = global.localVue
 
+const mocks = {
+  $t: jest.fn((t) => t),
+}
+
 describe('NotFoundPage', () => {
   let wrapper
 
   const Wrapper = () => {
-    return mount(NotFoundPage, { localVue })
+    return mount(NotFoundPage, { localVue, mocks })
   }
 
   describe('mount', () => {
@@ -18,5 +22,9 @@ describe('NotFoundPage', () => {
     it('has a svg', () => {
       expect(wrapper.find('svg').exists()).toBeTruthy()
     })
+
+    it('has a back button', () => {
+      expect(wrapper.find('.test-back').exists()).toBeTruthy()
+    })
   })
 })
diff --git a/admin/src/components/NotFoundPage.vue b/admin/src/components/NotFoundPage.vue
index 68a8fb3c4..f01f76044 100755
--- a/admin/src/components/NotFoundPage.vue
+++ b/admin/src/components/NotFoundPage.vue
@@ -4,7 +4,7 @@
     <div class="header py-1 py-lg-1 pt-lg-3">
       <b-container>
         <div class="header-body text-center mb-3">
-          <a href="login" to="login">
+          <a href="#!" @click="goback">
             <div class="container">
               <div class="row">
                 <div class="col-sm-12 col-md-12 mt-5 mb-5">
@@ -1185,6 +1185,11 @@
         </div>
       </b-container>
     </div>
+    <div class="text-center">
+      <b-button class="test-back" variant="light" @click="goback">
+        {{ $t('back') }}
+      </b-button>
+    </div>
   </div>
 </template>
 
@@ -1213,6 +1218,11 @@ export default {
       },
     }
   },
+  methods: {
+    goback() {
+      this.$router.go(-1)
+    },
+  },
 }
 </script>
 <style>
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 956ad7708..90a60475c 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -1,5 +1,6 @@
 {
   "all_emails": "Alle Nutzer",
+  "back": "zurück",
   "bookmark": "bookmark",
   "confirmed": "bestätigt",
   "creation": "Schöpfung",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index f2795c945..8775393dd 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -1,5 +1,6 @@
 {
   "all_emails": "All users",
+  "back": "back",
   "bookmark": "Remember",
   "confirmed": "confirmed",
   "creation": "Creation",
diff --git a/frontend/src/views/NotFoundPage.spec.js b/frontend/src/views/NotFoundPage.spec.js
index 709b24807..99eef569b 100644
--- a/frontend/src/views/NotFoundPage.spec.js
+++ b/frontend/src/views/NotFoundPage.spec.js
@@ -3,11 +3,15 @@ import NotFoundPage from './NotFoundPage'
 
 const localVue = global.localVue
 
+const mocks = {
+  $t: jest.fn((t) => t),
+}
+
 describe('NotFoundPage', () => {
   let wrapper
 
   const Wrapper = () => {
-    return mount(NotFoundPage, { localVue })
+    return mount(NotFoundPage, { localVue, mocks })
   }
 
   describe('mount', () => {
@@ -18,5 +22,9 @@ describe('NotFoundPage', () => {
     it('has a svg', () => {
       expect(wrapper.find('svg').exists()).toBeTruthy()
     })
+
+    it('has a back button', () => {
+      expect(wrapper.find('.test-back').exists()).toBeTruthy()
+    })
   })
 })
diff --git a/frontend/src/views/NotFoundPage.vue b/frontend/src/views/NotFoundPage.vue
index 68a8fb3c4..f01f76044 100755
--- a/frontend/src/views/NotFoundPage.vue
+++ b/frontend/src/views/NotFoundPage.vue
@@ -4,7 +4,7 @@
     <div class="header py-1 py-lg-1 pt-lg-3">
       <b-container>
         <div class="header-body text-center mb-3">
-          <a href="login" to="login">
+          <a href="#!" @click="goback">
             <div class="container">
               <div class="row">
                 <div class="col-sm-12 col-md-12 mt-5 mb-5">
@@ -1185,6 +1185,11 @@
         </div>
       </b-container>
     </div>
+    <div class="text-center">
+      <b-button class="test-back" variant="light" @click="goback">
+        {{ $t('back') }}
+      </b-button>
+    </div>
   </div>
 </template>
 
@@ -1213,6 +1218,11 @@ export default {
       },
     }
   },
+  methods: {
+    goback() {
+      this.$router.go(-1)
+    },
+  },
 }
 </script>
 <style>