diff --git a/app/src/main/java/com/example/nemophila/LoginActivity.java b/app/src/main/java/com/example/nemophila/LoginActivity.java
index c3bdf20..18169eb 100644
--- a/app/src/main/java/com/example/nemophila/LoginActivity.java
+++ b/app/src/main/java/com/example/nemophila/LoginActivity.java
@@ -37,6 +37,7 @@
         if ((nemophila.getUid() != null) && (nemophila.getToken() != null)){
             Intent intent = new Intent(LoginActivity.this,MainActivity.class);
             startActivity(intent);
+            return;
         }
 
         //通信の初期化
@@ -65,10 +66,12 @@
                         if (response.isSuccessful()) {
                             System.out.println("通信成功:changeBelongsAndMaster");
 
+                            //nemophila(自端末)にname,id,tokenを記憶
                             nemophila.setName(response.body().getName());
                             nemophila.setUid(response.body().getId());
                             nemophila.setToken(response.body().getToken());
 
+                            //mainに画面遷移
                             Intent intent = new Intent(LoginActivity.this,MainActivity.class);
                             startActivity(intent);
                         } else {
diff --git a/app/src/main/java/com/example/nemophila/SignUpActivity.java b/app/src/main/java/com/example/nemophila/SignUpActivity.java
index c3ab931..e1f276b 100644
--- a/app/src/main/java/com/example/nemophila/SignUpActivity.java
+++ b/app/src/main/java/com/example/nemophila/SignUpActivity.java
@@ -24,11 +24,16 @@
 
     private Retrofit retrofit;
     private AccountsRest AccountsRest;
+    private Nemophila nemophila;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_sign_up);
+
+        //Nemophilaと連携
+        nemophila = (Nemophila) this.getApplication();
+
         //通信の初期化
         this.retrofit = new Retrofit.Builder()
                 .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/nemophila/")
@@ -42,36 +47,45 @@
             public void onClick(View view) {
                 //Nameとpwを入力
                 EditText editname = (EditText) findViewById(R.id.editTextTextUserName);
-                String name = editname.getText().toString();
+                String name = editname.getText().toString().trim();
                 EditText editpw = (EditText) findViewById(R.id.editTextTextNewPassword);
-                String pw = editpw.getText().toString();
+                String pw = editpw.getText().toString().trim();
 
-                // 通信
-                Call<AccountJson> call = AccountsRest.createAccounts(name,pw);
+                if (!name.isEmpty() && !pw.isEmpty() && !name.trim().equals("") && !pw.trim().equals("")) {
+                    // 通信
+                    Call<AccountJson> call = AccountsRest.createAccounts(name, pw);
 
-                call.enqueue(new Callback<AccountJson>() {
-                    @Override
-                    public void onResponse(Call<AccountJson> call, Response<AccountJson> response) {
-                        if (response.isSuccessful()) {
-                            System.out.println("通信成功:changeBelongsAndMaster");
-                            Intent intent = new Intent(SignUpActivity.this,MainActivity.class);
-                            startActivity(intent);
-                        } else {
-                            System.out.println("通信可能：changeBelongsAndMaster: " + response.code());
-                            if (response.code() == 500){
-                                ((TextView) findViewById(R.id.textView)).setText("The UserName you gave is already in use.");
-                            }else if (response.code() == 404){
-                                ((TextView) findViewById(R.id.textView)).setText("SignUp failed. Please enter the correct credentials.");
+                    call.enqueue(new Callback<AccountJson>() {
+                        @Override
+                        public void onResponse(Call<AccountJson> call, Response<AccountJson> response) {
+                            if (response.isSuccessful()) {
+                                System.out.println("通信成功:changeBelongsAndMaster");
+
+                                //nemophila(自端末)にname,id,tokenを記憶
+                                nemophila.setName(response.body().getName());
+                                nemophila.setUid(response.body().getId());
+                                nemophila.setToken(response.body().getToken());
+
+                                //mainに画面遷移
+                                Intent intent = new Intent(SignUpActivity.this, MainActivity.class);
+                                startActivity(intent);
+                            } else {
+                                System.out.println("通信可能：changeBelongsAndMaster: " + response.code());
+                                if (response.code() == 500) {
+                                    ((TextView) findViewById(R.id.textView)).setText("The UserName you gave is already in use.");
+                                } else if (response.code() == 404) {
+                                    ((TextView) findViewById(R.id.textView)).setText("SignUp failed. Please enter the correct credentials.");
+                                }
                             }
                         }
-                    }
 
-                    @Override
-                    public void onFailure(Call<AccountJson> call, Throwable t) {
-                        System.out.println("通信失敗:changeBelongsAndMaster");
-                        System.out.println(t);
-                    }
-                });
+                        @Override
+                        public void onFailure(Call<AccountJson> call, Throwable t) {
+                            System.out.println("通信失敗:changeBelongsAndMaster");
+                            System.out.println(t);
+                        }
+                    });
+                }
             }
         });
 //Login画面に遷移