diff --git a/src/components/admin/management/setting/AppSetting.vue b/src/components/admin/management/setting/AppSetting.vue
index 787dbe1..4ec3374 100644
--- a/src/components/admin/management/setting/AppSetting.vue
+++ b/src/components/admin/management/setting/AppSetting.vue
@@ -58,7 +58,7 @@ export default defineComponent({
         },
         {
           key: "app.show_link_to_calendar",
-          value: formData.show_link_to_calendar.checked || null,
+          value: formData.show_link_to_calendar.checked,
         },
       ]);
     },
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 0d3f55a..bc9e251 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -65,6 +65,11 @@
         </div>
         <p v-if="loginError" class="text-center">{{ loginError }}</p>
       </form>
+      <div class="flex flex-col gap-2 empty:hidden">
+        <RouterLink v-if="appShow_link_to_calendar" :to="{ name: 'public-calendar' }" button primary-outline>
+          zum Kalender
+        </RouterLink>
+      </div>
 
       <FormBottomBar />
     </div>
@@ -95,7 +100,7 @@ export default defineComponent({
     };
   },
   computed: {
-    ...mapState(useConfigurationStore, ["clubName"]),
+    ...mapState(useConfigurationStore, ["clubName", "appShow_link_to_calendar"]),
   },
   mounted() {
     this.username = localStorage.getItem("username") ?? "";