diff --git a/handler/admin/getUserById.go b/handler/admin/getUserByEmail.go
similarity index 69%
rename from handler/admin/getUserById.go
rename to handler/admin/getUserByEmail.go
index 17ed6ed111d3f3c3729da46ca74af24dfd844a4f..0ad7a59fce2214548fd0aaae8b2443e4b5595ca7 100644
--- a/handler/admin/getUserById.go
+++ b/handler/admin/getUserByEmail.go
@@ -7,12 +7,12 @@ import (
 // Index godoc
 //
 //	@Tags					admin
-//	@Summary			Get User By Id
+//	@Summary			Get User By Email
 //	@Description	Get a user from database
 //	@Produce			json
 //	@Success			200	{object}	web.BaseResponse
 //	@Router				/admin/user/{id} [get]
-func (route AdminHandlerImpl) GetUserById(w http.ResponseWriter, r *http.Request){
-	payload := route.WrapperUtil.SuccessResponseWrap(route.AdminService.GetUserById())
+func (route AdminHandlerImpl) GetUserByEmail(w http.ResponseWriter, r *http.Request) {
+	payload := route.WrapperUtil.SuccessResponseWrap(route.AdminService.GetUserByEmail())
 	route.HttpUtil.WriteSuccessJson(w, payload)
-}
\ No newline at end of file
+}
diff --git a/handler/admin/types.go b/handler/admin/types.go
index bf0682ffb12eeface0ba88bd9e9104a21a0812d4..2f30c48ef83a3af3db9f4b5f71e8cfc5653c9166 100644
--- a/handler/admin/types.go
+++ b/handler/admin/types.go
@@ -4,7 +4,7 @@ import "net/http"
 
 type AdminHandler interface {
 	GetAllUser(w http.ResponseWriter, r *http.Request)
-	GetUserById(w http.ResponseWriter, r *http.Request)
+	GetUserByEmail(w http.ResponseWriter, r *http.Request)
 	AddUser(w http.ResponseWriter, r *http.Request)
 	UpdateUser(w http.ResponseWriter, r *http.Request)
 	DeleteUser(w http.ResponseWriter, r *http.Request)
diff --git a/routes/admin/route.go b/routes/admin/route.go
index 23f22ef1ad890b4c8ffbabd77d2e5cb899112448..01f19943524626adb4aea1b73f5a912d4fdee3fa 100644
--- a/routes/admin/route.go
+++ b/routes/admin/route.go
@@ -12,7 +12,7 @@ type AdminRoutes struct {
 func (adr AdminRoutes) Register(r chi.Router) {
 	r.Route("/admin", func(r chi.Router) {
 		r.Get("/user", adr.AdminHandler.GetAllUser)
-		r.Get("/user/{id}", adr.AdminHandler.GetUserById)
+		r.Get("/user/{id}", adr.AdminHandler.GetUserByEmail)
 		r.Post("/user", adr.AdminHandler.AddUser)
 		r.Patch("/user/{id}", adr.AdminHandler.UpdateUser)
 		r.Delete("/user/{id}", adr.AdminHandler.DeleteUser)
diff --git a/service/admin/getAllUser.go b/service/admin/getAllUser.go
index 4ba2d478fd2c4154203797c90a9598ecb69a2c5e..0977c267a8cbd463bc359a8b496105690cead99e 100644
--- a/service/admin/getAllUser.go
+++ b/service/admin/getAllUser.go
@@ -1,16 +1,11 @@
 package admin
 
-// import (
-	// "errors"
-	// "time"
+import (
+	"gitlab.informatika.org/ocw/ocw-backend/model/domain/user"
+)
 
-	// "github.com/golang-jwt/jwt/v4"
-	// "gitlab.informatika.org/ocw/ocw-backend/model/web"
-	// "gitlab.informatika.org/ocw/ocw-backend/model/web/auth/login"
-	// tokenModel "gitlab.informatika.org/ocw/ocw-backend/model/web/auth/token"
-	// "gorm.io/gorm"
-// )
-
-func (AdminServiceImpl) GetAllUser() string {
-	return "get all user"
+func (as AdminServiceImpl) GetAllUser() ([]user.User, error) {
+	var users []user.User
+	users, nil := as.UserRepository.GetAll()
+	return users, nil
 }
\ No newline at end of file
diff --git a/service/admin/getUserById.go b/service/admin/getUserByEmail.go
similarity index 79%
rename from service/admin/getUserById.go
rename to service/admin/getUserByEmail.go
index 36272f1f3460ecdb63c0cc7bd867003698867cb9..e577536e5acccc895a4861a6845d9cd3b13018d8 100644
--- a/service/admin/getUserById.go
+++ b/service/admin/getUserByEmail.go
@@ -11,6 +11,6 @@ package admin
 	// "gorm.io/gorm"
 // )
 
-func (AdminServiceImpl) GetUserById() string {
-	return "get user by id"
+func (AdminServiceImpl) GetUserByEmail() string {
+	return "get user by email"
 }
\ No newline at end of file