diff --git a/erpnext/public/js/education/web-academy/components/AcademyCourseCardButton.vue b/erpnext/public/js/education/web-academy/components/AcademyCourseCardButton.vue
index 7ff7a6e..b0d8859 100644
--- a/erpnext/public/js/education/web-academy/components/AcademyCourseCardButton.vue
+++ b/erpnext/public/js/education/web-academy/components/AcademyCourseCardButton.vue
@@ -11,9 +11,6 @@
             className: 'btn-primary'
         }
     },
-    mounted() {
-        this.$root.$data.updateCompletedCourses()
-    }
     computed: {
         getButtonName: function() {
             if(this.$root.$data.checkCourseCompletion(this.course)){
diff --git a/erpnext/public/js/education/web-academy/components/ContentNavigation.vue b/erpnext/public/js/education/web-academy/components/ContentNavigation.vue
index 1ea5fca..28f5a70 100644
--- a/erpnext/public/js/education/web-academy/components/ContentNavigation.vue
+++ b/erpnext/public/js/education/web-academy/components/ContentNavigation.vue
@@ -41,6 +41,8 @@
 						enrollment: this.$root.$data.enrolledCourses[this.$route.params.course]
 					}
 				})
+			this.$root.$data.addCompletedCourses(this.$route.params.course)
+			this.$root.$data.updateCompletedCourses()
 			this.$router.push({ name: 'program', params: { code: this.$route.params.code}})
 		}
 	}
diff --git a/erpnext/public/js/education/web-academy/pages/AcademyProgramPage.vue b/erpnext/public/js/education/web-academy/pages/AcademyProgramPage.vue
index b357302..ef45459 100644
--- a/erpnext/public/js/education/web-academy/pages/AcademyProgramPage.vue
+++ b/erpnext/public/js/education/web-academy/pages/AcademyProgramPage.vue
@@ -29,8 +29,11 @@
 			course_list: []
 		}
 	},
-	mounted() {
+    beforeMount(){
+        console.log("Before Mount")
         if(this.$root.$data.isLogin) this.$root.$data.updateCompletedCourses()
+    },
+	mounted() {
 		frappe.call({
             method: "erpnext.www.academy.get_program_details",
             args: {