diff --git a/atlas/migrations/20241126073229_add_column_users_email.sql b/atlas/migrations/20241126073229_add_column_users_email.sql
new file mode 100644
index 00000000..b4f96fdd
--- /dev/null
+++ b/atlas/migrations/20241126073229_add_column_users_email.sql
@@ -0,0 +1,2 @@
+-- Modify "users" table
+ALTER TABLE "public"."users" ADD COLUMN "email" character varying(255) NULL, ADD COLUMN "email_verified" boolean NULL DEFAULT false;
diff --git a/atlas/migrations/20241126073311_change_user_email_not_null.sql b/atlas/migrations/20241126073311_change_user_email_not_null.sql
new file mode 100644
index 00000000..3f4e82ef
--- /dev/null
+++ b/atlas/migrations/20241126073311_change_user_email_not_null.sql
@@ -0,0 +1,4 @@
+-- Modify "users" table
+ALTER TABLE "public"."users" ALTER COLUMN "email" SET NOT NULL, ALTER COLUMN "email_verified" SET NOT NULL;
+-- Create index "email" to table: "users"
+CREATE UNIQUE INDEX "email" ON "public"."users" ("email");
diff --git a/atlas/migrations/atlas.sum b/atlas/migrations/atlas.sum
index 82ff314c..0a1d2f5e 100644
--- a/atlas/migrations/atlas.sum
+++ b/atlas/migrations/atlas.sum
@@ -1,6 +1,8 @@
-h1:33BOoFIDyYBMfpcF5tQDv+RBNRH0fTenBPHUnlnSCaI=
+h1:5aYCq2wr+qJ4ckP53Fj+f/l0JFFOQG7C9ictTx6NvPo=
 20241021163015_create_user.sql h1:gCgeqsR5gC7HN2P2UeGrpMNAW5b9zJNSwPtURtwws1A=
 20241021163211_create_client.sql h1:Zk3Nd8qUAnS7v7eIvNaADHK8D0RqIcpkCjUT/Guxt1o=
 20241021163446_create_redirect_uri.sql h1:K1C6Q4XOQKbChyejJ/M7F3JHVOgu6DTweXnnX/fOjJ0=
 20241024084524_create_approvals.sql h1:7ar7WTyOGflX99Dpm5JiiCInKNrvPk+3UM6yHC+o4Sw=
 20241112154715_create_auth_codes.sql h1:GV/eitiRSfHDM1t1YDxKNKsNsrv35QPNSXDZPPKA+Ns=
+20241126073229_add_column_users_email.sql h1:st3u0Yl/fpXgr3JHyeT2/PHo5gywJY7lxm5l12Wd7u8=
+20241126073311_change_user_email_not_null.sql h1:crChtzneQLh7UXWKfEezju1d8/mAK+JzzfFgOHkq6MM=
diff --git a/atlas/schema.hcl b/atlas/schema.hcl
index ac40a22d..02a63475 100644
--- a/atlas/schema.hcl
+++ b/atlas/schema.hcl
@@ -5,6 +5,13 @@ table "users" {
   column "id" {
     type = bigserial
   }
+  column "email" {
+    type = varchar(255)
+  }
+  column "email_verified" {
+    type = boolean
+    default = false
+  }
   column "name" {
     type = varchar(255)
   }
@@ -24,6 +31,10 @@ table "users" {
     columns = [column.name]
     unique = true
   }
+  index "email" {
+    columns = [column.email]
+    unique = true
+  }
 }
 table "clients" {
   schema = schema.public
diff --git a/frontend/src/app/member/page.tsx b/frontend/src/app/member/page.tsx
index 030c1230..85e42048 100644
--- a/frontend/src/app/member/page.tsx
+++ b/frontend/src/app/member/page.tsx
@@ -14,8 +14,26 @@ export default function Page() {
   return (
     <Box sx={{ '> *': { margin: 2 } }}>
       <Typography mb={4} variant="h4">
-        ダッシュボード - {user.name}
+        ダッシュボード
       </Typography>
+      <Box p={4} borderRadius={2} maxWidth={800} bgcolor={blueGrey[50]}>
+        <Box display="flex" alignItems="center" mb={1}>
+          <Typography mr={3} variant="h5">
+            Account
+          </Typography>
+        </Box>
+        <Box bgcolor="white">
+          <Typography p={2} variant="h6">
+            ID: {user.id}
+          </Typography>
+          <Typography p={2} variant="h6">
+            Name: {user.name}
+          </Typography>
+          <Typography p={2} variant="h6">
+            Email: {user.email}
+          </Typography>
+        </Box>
+      </Box>
       <Box p={4} borderRadius={2} maxWidth={800} bgcolor={blueGrey[50]}>
         <Box display="flex" alignItems="center" mb={1}>
           <Typography mr={3} variant="h5">
diff --git a/frontend/src/components/SignupForm.tsx b/frontend/src/components/SignupForm.tsx
index 96f37800..b3c87d4e 100644
--- a/frontend/src/components/SignupForm.tsx
+++ b/frontend/src/components/SignupForm.tsx
@@ -9,6 +9,7 @@ import { Controller, useForm } from 'react-hook-form'
 
 type SignupInput = {
   name: string
+  email: string
   password: string
   passwordConfirmation: string
 }
@@ -20,13 +21,19 @@ export const SignupForm = ({ next }: SignupFormProps): JSX.Element => {
   const router = useRouter()
   const query = useSearchParams()
   const { control, handleSubmit, setError } = useForm<SignupInput>({
-    defaultValues: { name: '', password: '', passwordConfirmation: '' },
+    defaultValues: {
+      name: '',
+      email: '',
+      password: '',
+      passwordConfirmation: '',
+    },
   })
   const submit = useCallback(
     async (data: SignupInput) => {
       const { error } = await client.POST('/users/signup', {
         body: {
           name: data.name,
+          email: data.email,
           password: data.password,
           password_confirmation: data.passwordConfirmation,
         },
@@ -34,6 +41,11 @@ export const SignupForm = ({ next }: SignupFormProps): JSX.Element => {
       if (!!error) {
         if (error.error === 'name_already_used') {
           setError('name', { message: error.error })
+        } else if (
+          error.error === 'email_already_used' ||
+          error.error === 'email_format_invalid'
+        ) {
+          setError('email', { message: error.error_description })
         } else if (error.error === 'password_length_not_enough') {
           setError('password', { message: error.error_description })
         } else if (error.error === 'password_confirmation_not_match') {
@@ -76,6 +88,23 @@ export const SignupForm = ({ next }: SignupFormProps): JSX.Element => {
           )}
         />
       </Box>
+      <Box>
+        <Controller
+          name="email"
+          control={control}
+          render={({ field, fieldState }) => (
+            <TextField
+              label="Email"
+              variant="outlined"
+              fullWidth
+              required
+              error={fieldState.invalid}
+              helperText={fieldState.error?.message}
+              {...field}
+            />
+          )}
+        />
+      </Box>
       <Box>
         <Controller
           name="password"
diff --git a/frontend/src/utils/api.d.ts b/frontend/src/utils/api.d.ts
index 5189dc48..dcba281d 100644
--- a/frontend/src/utils/api.d.ts
+++ b/frontend/src/utils/api.d.ts
@@ -277,8 +277,10 @@ export interface components {
       /** Format: int64 */
       id: number
       name: string
+      email: string
     }
     'Users.ReqSignup': {
+      email: string
       name: string
       password: string
       password_confirmation: string
@@ -287,6 +289,8 @@ export interface components {
     'Users.SignupErr':
       | 'name_length_not_enough'
       | 'name_already_used'
+      | 'email_already_used'
+      | 'email_format_invalid'
       | 'password_length_not_enough'
       | 'password_confirmation_not_match'
   }
@@ -789,7 +793,6 @@ export interface operations {
       /** @description There is no content to send for this request, but the headers may be useful.  */
       204: {
         headers: {
-          'set-cookie': string
           [name: string]: unknown
         }
         content?: never
diff --git a/internal/api/gen.go b/internal/api/gen.go
index c82b8387..ef4643ff 100644
--- a/internal/api/gen.go
+++ b/internal/api/gen.go
@@ -91,6 +91,8 @@ const (
 
 // Defines values for UsersSignupErr.
 const (
+	EmailAlreadyUsed             UsersSignupErr = "email_already_used"
+	EmailFormatInvalid           UsersSignupErr = "email_format_invalid"
 	NameAlreadyUsed              UsersSignupErr = "name_already_used"
 	NameLengthNotEnough          UsersSignupErr = "name_length_not_enough"
 	PasswordConfirmationNotMatch UsersSignupErr = "password_confirmation_not_match"
@@ -213,12 +215,14 @@ type SessionMeRes struct {
 
 // User defines model for User.
 type User struct {
-	Id   int64  `json:"id"`
-	Name string `json:"name"`
+	Email string `json:"email"`
+	Id    int64  `json:"id"`
+	Name  string `json:"name"`
 }
 
 // UsersReqSignup defines model for Users.ReqSignup.
 type UsersReqSignup struct {
+	Email                string `json:"email"`
 	Name                 string `json:"name"`
 	Password             string `json:"password"`
 	PasswordConfirmation string `json:"password_confirmation"`
@@ -1059,16 +1063,10 @@ type UsersInterfaceSignupResponseObject interface {
 	VisitUsersInterfaceSignupResponse(w http.ResponseWriter) error
 }
 
-type UsersInterfaceSignup204ResponseHeaders struct {
-	SetCookie string
-}
-
 type UsersInterfaceSignup204Response struct {
-	Headers UsersInterfaceSignup204ResponseHeaders
 }
 
 func (response UsersInterfaceSignup204Response) VisitUsersInterfaceSignupResponse(w http.ResponseWriter) error {
-	w.Header().Set("set-cookie", fmt.Sprint(response.Headers.SetCookie))
 	w.WriteHeader(204)
 	return nil
 }
@@ -1578,40 +1576,40 @@ func (sh *strictHandler) UsersInterfaceSignup(ctx echo.Context) error {
 // Base64 encoded, gzipped, json marshaled Swagger object
 var swaggerSpec = []string{
 
-	"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",
-	"R3e/4tXN6u8AAAD//xkvUt4LNgAA",
+	"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",
 }
 
 // GetSwagger returns the content of the embedded swagger specification file
diff --git a/internal/api/session.go b/internal/api/session.go
index 26c6474c..a1dfd72f 100644
--- a/internal/api/session.go
+++ b/internal/api/session.go
@@ -60,8 +60,9 @@ func (s *Server) SessionInterfaceMe(ctx context.Context, request SessionInterfac
 	}
 	return &SessionInterfaceMe200JSONResponse{
 		User: &User{
-			Id:   int64(session.User.ID),
-			Name: session.User.Name,
+			Id:    int64(session.User.ID),
+			Name:  session.User.Name,
+			Email: session.User.Email,
 		},
 	}, nil
 }
diff --git a/internal/api/user.go b/internal/api/user.go
index e3cd9c1b..8ac9abd5 100644
--- a/internal/api/user.go
+++ b/internal/api/user.go
@@ -7,8 +7,8 @@ import (
 )
 
 func (s *Server) UsersInterfaceSignup(ctx context.Context, request UsersInterfaceSignupRequestObject) (UsersInterfaceSignupResponseObject, error) {
-	user, err := s.UserUsecase.SignUp(
-		request.Body.Name, request.Body.Password, request.Body.PasswordConfirmation,
+	_, err := s.UserUsecase.SignUp(
+		request.Body.Email, request.Body.Name, request.Body.Password, request.Body.PasswordConfirmation,
 	)
 	if errors.Is(err, domain.ErrNameLengthNotEnough) {
 		s.logger.Infof("name length not enough: %v", err)
@@ -42,14 +42,5 @@ func (s *Server) UsersInterfaceSignup(ctx context.Context, request UsersInterfac
 		s.logger.Errorf("failed to signup: %v", err)
 		return nil, err
 	}
-	cookie, err := Login(ctx, user)
-	if err != nil {
-		s.logger.Errorf("failed to login: %v", err)
-		return nil, err
-	}
-	return &UsersInterfaceSignup204Response{
-		Headers: UsersInterfaceSignup204ResponseHeaders{
-			SetCookie: cookie.String(),
-		},
-	}, nil
+	return &UsersInterfaceSignup204Response{}, nil
 }
diff --git a/internal/domain/oauth/mock_test.go b/internal/domain/oauth/mock_test.go
index ea2fa435..9f36be72 100644
--- a/internal/domain/oauth/mock_test.go
+++ b/internal/domain/oauth/mock_test.go
@@ -95,7 +95,7 @@ type userRepo struct{ Users []*domain.User }
 var _ domain.IUserRepo = &userRepo{}
 
 // Create implements domain.IUserRepo.
-func (u *userRepo) Create(name string, encryptedPassword string) error {
+func (u *userRepo) Create(email, name, encryptedPassword string) error {
 	panic("unimplemented")
 }
 
diff --git a/internal/domain/user.go b/internal/domain/user.go
index a22675df..b3aaebf3 100644
--- a/internal/domain/user.go
+++ b/internal/domain/user.go
@@ -11,6 +11,7 @@ import (
 type UserID int64
 type User struct {
 	ID                UserID
+	Email             string
 	Name              string
 	EncryptedPassword string
 	CreatedAt         time.Time
@@ -19,7 +20,7 @@ type User struct {
 type IUserRepo interface {
 	FindByID(id UserID) (*User, error)
 	FindByName(name string) (*User, error)
-	Create(name, encryptedPassword string) error
+	Create(email, name, encryptedPassword string) error
 }
 
 type UserService struct {
diff --git a/internal/infrastructure/gateway/auth_code_test.go b/internal/infrastructure/gateway/auth_code_test.go
index 4a787888..d787e384 100644
--- a/internal/infrastructure/gateway/auth_code_test.go
+++ b/internal/infrastructure/gateway/auth_code_test.go
@@ -22,8 +22,8 @@ func TestAuthCodeCreate(t *testing.T) {
 	authTime := time.Date(2021, 1, 1, 0, 0, 0, 0, time.UTC)
 	clientID := "test_client_id"
 	userID := int64(1)
-	query.User.Create(&model.User{ID: userID, Name: "test", EncryptedPassword: "test"})
-	query.User.Create(&model.User{ID: 2, Name: "test2", EncryptedPassword: "test2"})
+	query.User.Create(&model.User{ID: userID, Email: "test1@example.com", Name: "test", EncryptedPassword: "test"})
+	query.User.Create(&model.User{ID: 2, Email: "test2@example.com", Name: "test2", EncryptedPassword: "test2"})
 	query.Client.Create(&model.Client{
 		ID:              clientID,
 		EncryptedSecret: "",
@@ -89,7 +89,7 @@ func TestAuthCodeFind(t *testing.T) {
 	clientID := "test_client_id"
 	userID := int64(1)
 	value := "test_value"
-	query.User.Create(&model.User{ID: userID, Name: "test", EncryptedPassword: "test"})
+	query.User.Create(&model.User{ID: userID, Email: "test1@example.com", Name: "test", EncryptedPassword: "test"})
 	query.Client.Create(&model.Client{ID: clientID, EncryptedSecret: "", UserID: 1})
 	err := authCodeRepo.Create(value, oauth.ClientID(clientID), domain.UserID(userID), scopes, expiresAt, authTime, "test_redirect_uri")
 	if err != nil {
diff --git a/internal/infrastructure/gateway/client_test.go b/internal/infrastructure/gateway/client_test.go
index 612faa52..5bd4b711 100644
--- a/internal/infrastructure/gateway/client_test.go
+++ b/internal/infrastructure/gateway/client_test.go
@@ -125,8 +125,8 @@ func TestClientFindWithUserID(t *testing.T) {
 	const user2ID = 45329
 	const clientID = "client1"
 	initialUsers := []*model.User{
-		{Name: "test1", ID: userID, EncryptedPassword: "password"},
-		{Name: "test2", ID: user2ID, EncryptedPassword: "password"},
+		{Name: "test1", Email: "test1@example.com", ID: userID, EncryptedPassword: "password"},
+		{Name: "test2", Email: "test2@example.com", ID: user2ID, EncryptedPassword: "password"},
 	}
 	suites := []struct {
 		name     string
@@ -283,9 +283,9 @@ func TestClientList(t *testing.T) {
 	const user2ID = 45329
 	const user3ID = 45330
 	initialUsers := []*model.User{
-		{Name: "with clients", ID: userID, EncryptedPassword: "password"},
-		{Name: "with no client", ID: user2ID, EncryptedPassword: "password"},
-		{Name: "dummy user", ID: user3ID, EncryptedPassword: "password"},
+		{Name: "with clients", ID: userID, Email: "test1@example.com", EncryptedPassword: "password"},
+		{Name: "with no client", ID: user2ID, Email: "test2@example.com", EncryptedPassword: "password"},
+		{Name: "dummy user", ID: user3ID, Email: "test3@example.com", EncryptedPassword: "password"},
 	}
 	initialClients := []*oauth.ClientInput{
 		{ID: "with two uris", UserID: userID, RedirectURIs: []string{"http://example.com", "http://example1.com"}},
diff --git a/internal/infrastructure/gateway/user.go b/internal/infrastructure/gateway/user.go
index d1327298..2b959e9f 100644
--- a/internal/infrastructure/gateway/user.go
+++ b/internal/infrastructure/gateway/user.go
@@ -47,8 +47,9 @@ func (u *userRepo) FindByName(name string) (*domain.User, error) {
 	return toDomainUser(user), nil
 }
 
-func (u *userRepo) Create(name, encryptedPassword string) error {
+func (u *userRepo) Create(email, name, encryptedPassword string) error {
 	return u.query.User.Create(&model.User{
+		Email:             email,
 		Name:              name,
 		EncryptedPassword: encryptedPassword,
 	})
@@ -58,6 +59,7 @@ func toDomainUser(user *model.User) *domain.User {
 	return &domain.User{
 		ID:                domain.UserID(user.ID),
 		Name:              user.Name,
+		Email:             user.Email,
 		EncryptedPassword: user.EncryptedPassword,
 		CreatedAt:         user.CreatedAt,
 		UpdatedAt:         user.UpdatedAt,
diff --git a/internal/infrastructure/gateway/user_test.go b/internal/infrastructure/gateway/user_test.go
index 905a7fd2..71c16ec0 100644
--- a/internal/infrastructure/gateway/user_test.go
+++ b/internal/infrastructure/gateway/user_test.go
@@ -14,7 +14,7 @@ func TestUserCreate(t *testing.T) {
 	db := infrastructure.GetDB()
 	query := query.Use(db.Client)
 	userRepo := NewUserRepo(db)
-	err := userRepo.Create("test", "test")
+	err := userRepo.Create("test@example.com", "test", "test")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -25,17 +25,21 @@ func TestUserCreate(t *testing.T) {
 	if user.EncryptedPassword != "test" {
 		t.Errorf("unexpected user.EncryptedPassword: %s", user.EncryptedPassword)
 	}
+	if user.Email != "test@example.com" {
+		t.Errorf("unexpected user.Email: %s", user.Email)
+	}
 }
 
 func TestUserFindById(t *testing.T) {
 	setup(t)
 
+	const email = "test@example.com"
 	const name = "test"
 	const password = "test"
 	db := infrastructure.GetDB()
 	query := query.Use(db.Client)
 	userRepo := NewUserRepo(db)
-	err := userRepo.Create(name, password)
+	err := userRepo.Create(email, name, password)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -69,12 +73,13 @@ func TestUserFindByIdNotFound(t *testing.T) {
 func TestUserFindByName(t *testing.T) {
 	setup(t)
 
+	const email = "test@example.com"
 	const name = "test"
 	const password = "test"
 
 	db := infrastructure.GetDB()
 	userRepo := NewUserRepo(db)
-	err := userRepo.Create(name, password)
+	err := userRepo.Create(email, name, password)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/internal/infrastructure/model/users.gen.go b/internal/infrastructure/model/users.gen.go
index a8c0a9b1..a67c7316 100644
--- a/internal/infrastructure/model/users.gen.go
+++ b/internal/infrastructure/model/users.gen.go
@@ -17,6 +17,8 @@ type User struct {
 	EncryptedPassword string    `gorm:"column:encrypted_password;not null" json:"encrypted_password"`
 	CreatedAt         time.Time `gorm:"column:created_at;not null" json:"created_at"`
 	UpdatedAt         time.Time `gorm:"column:updated_at;not null" json:"updated_at"`
+	Email             string    `gorm:"column:email;not null" json:"email"`
+	EmailVerified     bool      `gorm:"column:email_verified;not null" json:"email_verified"`
 }
 
 // TableName User's table name
diff --git a/internal/infrastructure/query/users.gen.go b/internal/infrastructure/query/users.gen.go
index 150ac9fc..dc54eeb1 100644
--- a/internal/infrastructure/query/users.gen.go
+++ b/internal/infrastructure/query/users.gen.go
@@ -32,6 +32,8 @@ func newUser(db *gorm.DB, opts ...gen.DOOption) user {
 	_user.EncryptedPassword = field.NewString(tableName, "encrypted_password")
 	_user.CreatedAt = field.NewTime(tableName, "created_at")
 	_user.UpdatedAt = field.NewTime(tableName, "updated_at")
+	_user.Email = field.NewString(tableName, "email")
+	_user.EmailVerified = field.NewBool(tableName, "email_verified")
 
 	_user.fillFieldMap()
 
@@ -47,6 +49,8 @@ type user struct {
 	EncryptedPassword field.String
 	CreatedAt         field.Time
 	UpdatedAt         field.Time
+	Email             field.String
+	EmailVerified     field.Bool
 
 	fieldMap map[string]field.Expr
 }
@@ -68,6 +72,8 @@ func (u *user) updateTableName(table string) *user {
 	u.EncryptedPassword = field.NewString(table, "encrypted_password")
 	u.CreatedAt = field.NewTime(table, "created_at")
 	u.UpdatedAt = field.NewTime(table, "updated_at")
+	u.Email = field.NewString(table, "email")
+	u.EmailVerified = field.NewBool(table, "email_verified")
 
 	u.fillFieldMap()
 
@@ -84,12 +90,14 @@ func (u *user) GetFieldByName(fieldName string) (field.OrderExpr, bool) {
 }
 
 func (u *user) fillFieldMap() {
-	u.fieldMap = make(map[string]field.Expr, 5)
+	u.fieldMap = make(map[string]field.Expr, 7)
 	u.fieldMap["id"] = u.ID
 	u.fieldMap["name"] = u.Name
 	u.fieldMap["encrypted_password"] = u.EncryptedPassword
 	u.fieldMap["created_at"] = u.CreatedAt
 	u.fieldMap["updated_at"] = u.UpdatedAt
+	u.fieldMap["email"] = u.Email
+	u.fieldMap["email_verified"] = u.EmailVerified
 }
 
 func (u user) clone(db *gorm.DB) user {
diff --git a/internal/usecase/user.go b/internal/usecase/user.go
index 78e11415..93f195a5 100644
--- a/internal/usecase/user.go
+++ b/internal/usecase/user.go
@@ -34,7 +34,7 @@ func (u *UserUsecase) Login(username, password string) (*domain.User, error) {
 	return user, nil
 }
 
-func (u *UserUsecase) SignUp(username, password, passwordConfirmation string) (*domain.User, error) {
+func (u *UserUsecase) SignUp(email, username, password, passwordConfirmation string) (*domain.User, error) {
 	if err := u.UserService.Validate(username, password, passwordConfirmation); err != nil {
 		return nil, err
 	}
@@ -42,7 +42,7 @@ func (u *UserUsecase) SignUp(username, password, passwordConfirmation string) (*
 	if err != nil {
 		return nil, err
 	}
-	err = u.UserRepo.Create(username, hash)
+	err = u.UserRepo.Create(email, username, hash)
 	if err != nil {
 		return nil, err
 	}
diff --git a/spec/schema/@typespec/openapi3/openapi.yaml b/spec/schema/@typespec/openapi3/openapi.yaml
index d16453c3..a08b93e2 100644
--- a/spec/schema/@typespec/openapi3/openapi.yaml
+++ b/spec/schema/@typespec/openapi3/openapi.yaml
@@ -463,11 +463,6 @@ paths:
       responses:
         '204':
           description: 'There is no content to send for this request, but the headers may be useful. '
-          headers:
-            set-cookie:
-              required: true
-              schema:
-                type: string
         '400':
           description: The server could not understand the request due to invalid syntax.
           content:
@@ -704,19 +699,25 @@ components:
       required:
         - id
         - name
+        - email
       properties:
         id:
           type: integer
           format: int64
         name:
           type: string
+        email:
+          type: string
     Users.ReqSignup:
       type: object
       required:
+        - email
         - name
         - password
         - password_confirmation
       properties:
+        email:
+          type: string
         name:
           type: string
         password:
@@ -728,6 +729,8 @@ components:
       enum:
         - name_length_not_enough
         - name_already_used
+        - email_already_used
+        - email_format_invalid
         - password_length_not_enough
         - password_confirmation_not_match
   securitySchemes:
diff --git a/spec/specs/model.tsp b/spec/specs/model.tsp
index 2d50d1df..738b410a 100644
--- a/spec/specs/model.tsp
+++ b/spec/specs/model.tsp
@@ -3,6 +3,7 @@ model User {
   id: int64;
 
   name: string;
+  email: string;
 
   @visibility("create")
   password: string;
diff --git a/spec/specs/users.tsp b/spec/specs/users.tsp
index 4c251ad5..26609bf9 100644
--- a/spec/specs/users.tsp
+++ b/spec/specs/users.tsp
@@ -8,6 +8,7 @@ using TypeSpec.Rest;
 namespace Auth.Users;
 
 model ReqSignup {
+  email: string;
   name: string;
   password: string;
   password_confirmation: string;
@@ -16,6 +17,8 @@ model ReqSignup {
 enum SignupErr {
   name_length_not_enough,
   name_already_used,
+  email_already_used,
+  email_format_invalid,
   password_length_not_enough,
   password_confirmation_not_match,
 }
@@ -27,7 +30,6 @@ interface UsersInterface {
   @summary("Signup")
   signup(@body body: ReqSignup): {
     @statusCode statusCode: 204;
-    @header setCookie: string;
   } | {
     @statusCode statusCode: 400;
     error: SignupErr;
diff --git a/test/e2e/oauth_test.go b/test/e2e/oauth_test.go
index d23dd2c0..05cb4435 100644
--- a/test/e2e/oauth_test.go
+++ b/test/e2e/oauth_test.go
@@ -34,8 +34,8 @@ func TestOAuthAuthorize(t *testing.T) {
 	const client2ID = "client2"
 	const client3ID = "client3"
 	initialUsers := []*model.User{
-		{ID: userID, Name: username, EncryptedPassword: string(hashed)},
-		{ID: clientOwnerID, Name: "client owner", EncryptedPassword: string(hashed)},
+		{ID: userID, Email: "test1@example.com", Name: username, EncryptedPassword: string(hashed)},
+		{ID: clientOwnerID, Email: "test2@example.com", Name: "client owner", EncryptedPassword: string(hashed)},
 	}
 	initialClients := []*model.Client{
 		{ID: client1ID, Name: "approved", EncryptedSecret: "secret", UserID: clientOwnerID},
@@ -185,8 +185,8 @@ func TestOAuthToken(t *testing.T) {
 		t.Fatalf("failed to hash password: %v", err)
 	}
 	initialUsers := []*model.User{
-		{ID: userID, Name: username, EncryptedPassword: string(hashed)},
-		{ID: clientOwnerID, Name: "client owner", EncryptedPassword: "password"},
+		{ID: userID, Name: username, Email: "test1@example.com", EncryptedPassword: string(hashed)},
+		{ID: clientOwnerID, Name: "client owner", Email: "test2@example.com", EncryptedPassword: "password"},
 	}
 	const client1ID = "client1"
 	const client2ID = "client2"
@@ -361,8 +361,8 @@ func TestAuthTime(t *testing.T) {
 	}
 	const clientOwnerID = 32478
 	initialUsers := []*model.User{
-		{ID: clientOwnerID, Name: "client owner", EncryptedPassword: "password"},
-		{ID: userID, Name: username, EncryptedPassword: string(hashed)},
+		{ID: clientOwnerID, Name: "client owner", Email: "test1@example.com", EncryptedPassword: "password"},
+		{ID: userID, Name: username, Email: "test2@example.com", EncryptedPassword: string(hashed)},
 	}
 	const clientID = "client1"
 	const clientSecret = "secret"
diff --git a/test/e2e/user_test.go b/test/e2e/user_test.go
index cd9c9f69..55a4949c 100644
--- a/test/e2e/user_test.go
+++ b/test/e2e/user_test.go
@@ -12,11 +12,13 @@ func TestSignupLogin(t *testing.T) {
 	defer s.Close()
 
 	name := randomString(t, 10)
+	email := randomString(t, 10) + "@example.com"
 	password := randomString(t, 16)
 
 	{ // signup
 		signupInput := &api.UsersReqSignup{
 			Name:                 name,
+			Email:                email,
 			Password:             password,
 			PasswordConfirmation: password,
 		}
@@ -56,4 +58,7 @@ func TestSignupLogin(t *testing.T) {
 	if resBody.User.Name != name {
 		t.Fatalf("unexpected name: %v", resBody.User.Name)
 	}
+	if resBody.User.Email != email {
+		t.Fatalf("unexpected email: %v", resBody.User.Email)
+	}
 }