diff --git a/package.json b/package.json
index 3a5ebe2f..a37a8490 100644
--- a/package.json
+++ b/package.json
@@ -95,4 +95,4 @@
     "linux": {},
     "mac": {}
   }
-}
\ No newline at end of file
+}
diff --git a/src/components/Navigation/index.svelte b/src/components/Navigation/index.svelte
index 899a4e42..cbf08ff6 100644
--- a/src/components/Navigation/index.svelte
+++ b/src/components/Navigation/index.svelte
@@ -1,6 +1,7 @@
 <script>
   import { goto, stores } from '@sapper/app';
   import { user } from '../../utils/store/user';
+  import { appStore } from '../../utils/store/app';
   import { isCoursePage } from '../../utils/functions/app';
   import PrimaryButton from '../PrimaryButton/index.svelte';
   import { VARIANTS } from '../PrimaryButton/constants';
@@ -86,7 +87,9 @@
     <span class="flex-grow" />
 
     {#if $user.isLoggedIn}
-      <li><a class="block" href="/lms"> Go to LMS </a></li>
+      {#if $appStore.isStudentDomain}
+        <li><a class="block" href="/lms"> Go to LMS </a></li>
+      {/if}
     {:else}
       <li>
         {#if !disableLogin}
diff --git a/src/routes/404.svelte b/src/routes/404.svelte
index c213718f..f39f29b2 100644
--- a/src/routes/404.svelte
+++ b/src/routes/404.svelte
@@ -1,7 +1,12 @@
 <script>
   import { stores, goto } from '@sapper/app';
+<<<<<<< HEAD
   import { appStore } from '../utils/store/app';
   import PrimaryButton from '../components/PrimaryButton/index.svelte';
+=======
+  import PrimaryButton from '../components/PrimaryButton/index.svelte';
+
+>>>>>>> f7dda7d7ebcb719575404e3858c77de1aeb721a4
   const { page } = stores();
   const src = './bg-404.png';