diff --git a/src/main/java/org/ntlab/acanthus_server/entities/Account.java b/src/main/java/org/ntlab/acanthus_server/entities/Account.java
index f8536ba..5ffe796 100644
--- a/src/main/java/org/ntlab/acanthus_server/entities/Account.java
+++ b/src/main/java/org/ntlab/acanthus_server/entities/Account.java
@@ -20,56 +20,68 @@
 // ////////////////////////////////////////////////////////////////////////////////////////
 package org.ntlab.acanthus_server.entities;
 
+import java.util.UUID;
+
 public class Account {
     private int uid;
     private String name;
     private String email;
     private String token;
     private String password;
-  //コンストラクト
+
+    //コンストラクト
     public Account(String name, String email, String password) {
-        this.name=name;
-        this.email=email;
-        this.password=password;
+        this.name = name;
+        this.email = email;
+        this.password = password;
     }
 
+    //-----------------------------------------------------------------
+    //-----------------------------------------------------------------
     //uidを返す
     //GetとSetを実装
     public int getUid() {
         return uid;
     }
-    public void setUid(){
-        this.uid=uid;
+
+    //-----------------------------------------------------------------
+    public void setUid(int uid) {
+        this.uid = uid;
     }
-    
-    
+
+    //-----------------------------------------------------------------
     //tokenを返す
     //GetとSetを実装
     public String getToken() {
         return token;
     }
-    public void setToken(String token){
-        this.token=token;
+
+    //-----------------------------------------------------------------
+    // トークンを生成する
+    public void createToken() {
+        this.token = UUID.randomUUID().toString();
     }
+
+    //-----------------------------------------------------------------
     //passwordをtoken認証後返す
     public String getPassword(String token) {
         //IFでトークン認証をしたのちに返す
         return password;
     }
+    //-----------------------------------------------------------------
     //emailを返す
     public String getEmail() {
         return email;
     }
-    public void setEmail(String email){
-        this.email=email;
+    //-----------------------------------------------------------------
+    public void setEmail(String email) {
+        this.email = email;
     }
-
-    //Auth関数でpassword認証
-    public boolean accountAuth(String password){
-        return this.password == password;
+    //-----------------------------------------------------------------
+    //　パスワードが一致しているかを判定
+    public boolean isMatchedPassword(String password) {
+        return this.password.equals(password);
     }
 
 
-
-
 }