diff --git a/apiclient/users.go b/apiclient/users.go
index bd4dfc3..e5c3dfe 100644
--- a/apiclient/users.go
+++ b/apiclient/users.go
@@ -9,8 +9,7 @@ import (
 )
 
 const (
-	UserLoginRoute    = "api/v1/users/login"
-	UserRegisterRoute = "api/v1/users/register"
+	UserBaseRoute = "api/v1/users"
 )
 
 type Users interface {
@@ -31,7 +30,7 @@ func newUserService(serverAddress string) userClient {
 }
 
 func (a userClient) Login(username, password string) (domain.LoginResponse, error) {
-	endpoint := fmt.Sprintf("%s/%s", a.serverAddress, UserLoginRoute)
+	endpoint := fmt.Sprintf("%s/%s/login", a.serverAddress, UserBaseRoute)
 
 	param := url.Values{}
 	param.Set("username", username)
@@ -48,7 +47,7 @@ func (a userClient) Login(username, password string) (domain.LoginResponse, erro
 }
 
 func (a userClient) SignUp(username, password string) (domain.BaseResponse, error) {
-	endpoint := fmt.Sprintf("%s/%s", a.serverAddress, UserRegisterRoute)
+	endpoint := fmt.Sprintf("%s/%s/register", a.serverAddress, UserBaseRoute)
 	
 	param := url.Values{}
 	param.Set("username", username)
diff --git a/internal/handlers/users.go b/internal/handlers/users.go
index 65e2ead..fe61477 100644
--- a/internal/handlers/users.go
+++ b/internal/handlers/users.go
@@ -21,21 +21,10 @@ func (h *Handler) UserAfterLogin(c echo.Context) error {
 	if err != nil {
 		return Render(c, http.StatusBadRequest, users.AfterLogin(err.Error(), false))
 	}
-
-	cookie := new(http.Cookie)
-	cookie.Name = domain.CookieToken
-	cookie.Value = resp.Token
-	c.SetCookie(cookie)
-
-	cookie = new(http.Cookie)
-	cookie.Name = domain.CookieRefreshToken
-	cookie.Value = resp.RefreshToken
-	c.SetCookie(cookie)
-
-	cookie = new(http.Cookie)
-	cookie.Name = domain.CookieUser
-	cookie.Value = user
-	c.SetCookie(cookie)
+	
+	SetCookie(c, domain.CookieToken, resp.Token)
+	SetCookie(c, domain.CookieRefreshToken, resp.RefreshToken)
+	SetCookie(c, domain.CookieUser, user)
 
 	return Render(c, http.StatusOK, users.AfterLogin("Login Successful!", true))
 }