diff --git a/dao/src/main/java/greencity/entity/HabitInvitation.java b/dao/src/main/java/greencity/entity/HabitInvitation.java
index bff644682..b672b0db0 100644
--- a/dao/src/main/java/greencity/entity/HabitInvitation.java
+++ b/dao/src/main/java/greencity/entity/HabitInvitation.java
@@ -35,6 +35,14 @@ public class HabitInvitation {
     @JoinColumn(name = "invitee_habit_assign_id", nullable = false)
     private HabitAssign inviteeHabitAssign;
 
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "inviter_id", nullable = false)
+    private User inviter;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "invitee_id", nullable = false)
+    private User invitee;
+
     @Enumerated(EnumType.STRING)
     private HabitInvitationStatus status;
 }
diff --git a/dao/src/main/java/greencity/repository/HabitInvitationRepo.java b/dao/src/main/java/greencity/repository/HabitInvitationRepo.java
index 90316316d..d8cbb3b8d 100644
--- a/dao/src/main/java/greencity/repository/HabitInvitationRepo.java
+++ b/dao/src/main/java/greencity/repository/HabitInvitationRepo.java
@@ -82,14 +82,22 @@ invitations AS (
               AND i.inviter_habit_assign_id IN (
                   SELECT ha.id FROM habit_assign ha WHERE ha.habit_id = :habitId
               )
+        ),
+        habit_assignments AS (
+            SELECT DISTINCT ha.user_id AS friend_id
+            FROM habit_assign ha
+            WHERE ha.habit_id = :habitId
+            AND ha.status = 'INPROGRESS'
+            AND ha.user_id IN (SELECT id FROM friends)
         )
         SELECT f.id,
                f.name,
                f.email,
                f.profile_picture,
-               COALESCE(inv.has_invitation, FALSE) AS has_invitation
+               COALESCE(inv.friend_id, ha.friend_id) IS NOT NULL AS has_invitation
         FROM filtered_friends f
         LEFT JOIN invitations inv ON f.id = inv.friend_id
+        LEFT JOIN habit_assignments ha ON f.id = ha.friend_id
         """)
     List<Tuple> findUserFriendsWithHabitInvites(
         Long userId, String name, Long habitId, Pageable pageable);
diff --git a/dao/src/main/resources/db/changelog/db.changelog-master.xml b/dao/src/main/resources/db/changelog/db.changelog-master.xml
index 831890abb..c5e06e860 100644
--- a/dao/src/main/resources/db/changelog/db.changelog-master.xml
+++ b/dao/src/main/resources/db/changelog/db.changelog-master.xml
@@ -255,4 +255,5 @@
     <include file="db/changelog/logs/ch-habits-users-dislikes-table.xml"/>
     <include file="db/changelog/logs/сh-update-habit-invitation-statuses.xml"/>
     <include file="db/changelog/logs/ch-remove-duplicates-from-habit-invitations.xml"/>
+    <include file="db/changelog/logs/ch-add-invitee-id-and-inviter-id-to-habit-invite-table.xml"/>
 </databaseChangeLog>
diff --git a/dao/src/main/resources/db/changelog/logs/ch-add-invitee-id-and-inviter-id-to-habit-invite-table.xml b/dao/src/main/resources/db/changelog/logs/ch-add-invitee-id-and-inviter-id-to-habit-invite-table.xml
new file mode 100644
index 000000000..b0dcea94c
--- /dev/null
+++ b/dao/src/main/resources/db/changelog/logs/ch-add-invitee-id-and-inviter-id-to-habit-invite-table.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                   http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.8.xsd">
+
+    <changeSet id="add-inviter-invitee-user-columns" author="Ivan Holotsvan">
+        <addColumn tableName="habit_invitations">
+            <column name="inviter_id" type="BIGINT"/>
+            <column name="invitee_id" type="BIGINT"/>
+        </addColumn>
+
+        <addForeignKeyConstraint
+                baseTableName="habit_invitations"
+                baseColumnNames="inviter_id"
+                referencedTableName="users"
+                referencedColumnNames="id"
+                constraintName="fk_habit_invitations_inviter_user"/>
+
+        <addForeignKeyConstraint
+                baseTableName="habit_invitations"
+                baseColumnNames="invitee_id"
+                referencedTableName="users"
+                referencedColumnNames="id"
+                constraintName="fk_habit_invitations_invitee_user"/>
+    </changeSet>
+
+    <changeSet id="populate-inviter-invitee-user-columns" author="Ivan Holotsvan">
+        <sql>
+            UPDATE habit_invitations hi
+            SET inviter_id = ha.user_id
+                FROM habit_assign ha
+            WHERE hi.inviter_habit_assign_id = ha.id
+              AND hi.inviter_id IS NULL;
+        </sql>
+
+        <sql>
+            UPDATE habit_invitations hi
+            SET invitee_id = ha.user_id
+                FROM habit_assign ha
+            WHERE hi.invitee_habit_assign_id = ha.id
+              AND hi.invitee_id IS NULL;
+        </sql>
+    </changeSet>
+
+    <changeSet id="make-inviter-invitee-columns-not-null" author="Ivan Holotsvan">
+        <addNotNullConstraint tableName="habit_invitations" columnName="inviter_id"/>
+        <addNotNullConstraint tableName="habit_invitations" columnName="invitee_id"/>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/service/src/main/java/greencity/service/HabitAssignServiceImpl.java b/service/src/main/java/greencity/service/HabitAssignServiceImpl.java
index add59c2dc..b22413fff 100644
--- a/service/src/main/java/greencity/service/HabitAssignServiceImpl.java
+++ b/service/src/main/java/greencity/service/HabitAssignServiceImpl.java
@@ -1646,6 +1646,8 @@ private HabitInvitation createHabitInvitation(HabitAssign inviteeHabitAssign, Ha
         return HabitInvitation.builder()
             .inviteeHabitAssign(inviteeHabitAssign)
             .inviterHabitAssign(inviterHabitAssign)
+            .inviter(inviterHabitAssign.getUser())
+            .invitee(inviteeHabitAssign.getUser())
             .status(HabitInvitationStatus.PENDING)
             .build();
     }