diff --git a/src/module/bimbingan_log/transport/admin_handler.go b/src/module/bimbingan_log/transport/admin_handler.go
index b26f266443ef08ac7ef59f151303b5177e97367a..e12877ddcf938e722228203a1734ee3c726c481f 100644
--- a/src/module/bimbingan_log/transport/admin_handler.go
+++ b/src/module/bimbingan_log/transport/admin_handler.go
@@ -27,7 +27,6 @@ func NewAdminBimginganLogHandler(cfg config.BimbinganLogTransportConfig) *AdminB
 
 func (t *AdminBimbinganLogHandler) MountAdmin(group *echo.Group) {
 	group.GET("/bimbingan-logs", t.GetBimbinganLog)
-	group.GET("/bimbingan-logs-status",t.GetBimbinganLogStatus)
 }
 
 func (t *AdminBimbinganLogHandler) GetBimbinganLog(c echo.Context) error {
@@ -47,17 +46,3 @@ func (t *AdminBimbinganLogHandler) GetBimbinganLog(c echo.Context) error {
 
 	return c.JSON(http.StatusOK, utils.ResponseDetailOutput(true, http.StatusOK, "Bimbingan logs successfully retreived", BimbinganLogsBerkas))
 }
-
-func (t *AdminBimbinganLogHandler) GetBimbinganLogStatus(c echo.Context) error {
-	param, err := utils.GetLimitOffset(c.QueryParams())
-	nim := c.QueryParam("id_mahasiswa")
-	if err != nil {
-		return c.JSON(http.StatusInternalServerError, utils.ResponseDetailOutput(false, http.StatusInternalServerError, err.Error(), nil))
-	}
-	listBimbinganLogStatuts, err := t.bimbinganLogUsecase.GetBimbinganLogStatusByStudentId(param, nim)
-	if err != nil {
-		return c.JSON(http.StatusBadRequest, utils.ResponseDetailOutput(false, http.StatusBadRequest, err.Error(), nil))
-	}
-
-	return c.JSON(http.StatusOK, utils.ResponseDetailOutput(true, http.StatusOK, "Bimbingan logs Status successfully retreived", listBimbinganLogStatuts))
-}
diff --git a/src/module/bimbingan_log/transport/mahasiswa_handler.go b/src/module/bimbingan_log/transport/mahasiswa_handler.go
index 8cc2cecad70cac0d4def87b4a860b92c8c794e0e..1a18148b2864c8ce90d29e4be54d50d848402e97 100644
--- a/src/module/bimbingan_log/transport/mahasiswa_handler.go
+++ b/src/module/bimbingan_log/transport/mahasiswa_handler.go
@@ -27,6 +27,7 @@ func NewMahasiswaBimginganLogHandler(cfg config.BimbinganLogTransportConfig) *Ma
 
 func (t *MahasiswaBimbinganLogHandler) MountMahasiswa(group *echo.Group) {
 	group.POST("/add-bimbingan-log", t.AddBimbinganLog)
+	group.GET("/bimbingan-logs-status", t.GetBimbinganLogStatus)
 }
 
 // AddBimbinganLog godoc
@@ -52,3 +53,17 @@ func (t *MahasiswaBimbinganLogHandler) AddBimbinganLog(c echo.Context) error {
 
 	return c.JSON(http.StatusOK, utils.ResponseDetailOutput(true, http.StatusCreated, "Bimbingan log added successfully", newBimbinganLogBerkas))
 }
+
+func (t *MahasiswaBimbinganLogHandler) GetBimbinganLogStatus(c echo.Context) error {
+	param, err := utils.GetLimitOffset(c.QueryParams())
+	nim := c.QueryParam("id_mahasiswa")
+	if err != nil {
+		return c.JSON(http.StatusInternalServerError, utils.ResponseDetailOutput(false, http.StatusInternalServerError, err.Error(), nil))
+	}
+	listBimbinganLogStatuts, err := t.bimbinganLogUsecase.GetBimbinganLogStatusByStudentId(param, nim)
+	if err != nil {
+		return c.JSON(http.StatusBadRequest, utils.ResponseDetailOutput(false, http.StatusBadRequest, err.Error(), nil))
+	}
+
+	return c.JSON(http.StatusOK, utils.ResponseDetailOutput(true, http.StatusOK, "Bimbingan logs Status successfully retreived", listBimbinganLogStatuts))
+}
diff --git a/src/module/pendaftaran_sidsem/internal/repository/pendaftaran_sidsem.go b/src/module/pendaftaran_sidsem/internal/repository/pendaftaran_sidsem.go
index 35c5b98f20ae99f09d0b940a2e1a5372bc4e9d01..d39379a31c6ca03a3e256d958765484cd359a118 100644
--- a/src/module/pendaftaran_sidsem/internal/repository/pendaftaran_sidsem.go
+++ b/src/module/pendaftaran_sidsem/internal/repository/pendaftaran_sidsem.go
@@ -481,7 +481,7 @@ func (repo *PendaftaranSidSemRepo) GetNameUntilTopikPlaceholders(idMahasiswa str
 func (repo *PendaftaranSidSemRepo) GetDosbingNamePlaceholder(idMahasiswa string) (entity.DosbingName, error) {
 	var dosbingName entity.DosbingName
 
-	query := ` SELECT p.nama FROM pengguna p JOIN dosen_bimbingan db ON p.id = db.dosen_id JOIN pendaftaran_ta pt ON db.pendaftaran_id = pt.id WHERE pt.id_mahasiswa = ? AND pt.status = true;`
+	query := ` SELECT p.nama FROM pengguna p JOIN dosen_bimbingan db ON p.id = db.dosen_id JOIN pendaftaran_ta pt ON db.pendaftaran_id = pt.id WHERE pt.id_mahasiswa = ? AND pt.status = 'APPROVED';`
 
 	if err := repo.DBRead.Raw(query, idMahasiswa).Scan(&dosbingName).Error; err != nil {
 		return entity.DosbingName{}, err