diff --git a/app/models/course_activity.rb b/app/models/course_activity.rb
index cf356dc05..1d0920c1c 100644
--- a/app/models/course_activity.rb
+++ b/app/models/course_activity.rb
@@ -15,8 +15,8 @@ class CourseActivity < ActiveRecord::Base
       user_activity.save
     else
       user_activity = UserActivity.new
-      user_activity.act_id = self.id
-      user_activity.act_type = self.class.to_s
+      user_activity.act_id = self.course_act_id
+      user_activity.act_type = self.course_act_type
       user_activity.container_type = "Course"
       user_activity.container_id = self.course_id
       user_activity.save
diff --git a/app/models/forge_activity.rb b/app/models/forge_activity.rb
index 5d8de8e3a..b7fc5e4c2 100644
--- a/app/models/forge_activity.rb
+++ b/app/models/forge_activity.rb
@@ -30,8 +30,8 @@ class ForgeActivity < ActiveRecord::Base
       user_activity.save
     else
       user_activity = UserActivity.new
-      user_activity.act_id = self.id
-      user_activity.act_type = self.class.to_s
+      user_activity.act_id = self.forge_act_id
+      user_activity.act_type = self.forge_act_type
       user_activity.container_type = "Project"
       user_activity.container_id = self.project_id
       user_activity.save
diff --git a/db/migrate/20150820025358_about_user_activities.rb b/db/migrate/20150820025358_about_user_activities.rb
index f3916cff3..ea98e9a32 100644
--- a/db/migrate/20150820025358_about_user_activities.rb
+++ b/db/migrate/20150820025358_about_user_activities.rb
@@ -5,8 +5,8 @@ class AboutUserActivities < ActiveRecord::Migration
       for i in 1 ... forge_count do i
         ForgeActivity.page(i).per(30).each do |activity|
           user_activity = UserActivity.new
-          user_activity.act_id = activity.id
-          user_activity.act_type = activity.class.to_s
+          user_activity.act_id = activity.forge_act_id
+          user_activity.act_type = activity.forge_act_type
           user_activity.container_type = "Project"
           user_activity.container_id = activity.project_id
           user_activity.created_at = activity.created_at
@@ -20,8 +20,8 @@ class AboutUserActivities < ActiveRecord::Migration
       for i in 1 ... course_count do i
       CourseActivity.page(i).per(30).each do |activity|
         user_activity = UserActivity.new
-        user_activity.act_id = activity.id
-        user_activity.act_type = activity.class.to_s
+        user_activity.act_id = activity.course_act_id
+        user_activity.act_type = activity.course_act_type
         user_activity.container_type = "Course"
         user_activity.container_id = activity.course_id
         user_activity.created_at = activity.created_at