diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/Login/LoginScreenActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/Login/LoginScreenActivity.java
index 349032c..a508142 100644
--- a/app/src/main/java/org/ntlab/acanthus_client/views/Login/LoginScreenActivity.java
+++ b/app/src/main/java/org/ntlab/acanthus_client/views/Login/LoginScreenActivity.java
@@ -43,7 +43,7 @@
     private void onClicked(LoginRest loginRest) {
 
         EditText editEmailTextView = findViewById(R.id.editTextTextLoginEmail);
-        EditText editPasswordTextView = findViewById(R.id.editTextTextPassword);
+        EditText editPasswordTextView = findViewById(R.id.editTextTextSignUpPassword);
         Button loginButton = (Button) findViewById(R.id.buttonLoginLogin);
 
         loginButton.setOnClickListener(v -> {
diff --git a/app/src/main/res/layout/activity_sign_up.xml b/app/src/main/res/layout/activity_sign_up.xml
index 628e80b..b6c18d8 100644
--- a/app/src/main/res/layout/activity_sign_up.xml
+++ b/app/src/main/res/layout/activity_sign_up.xml
@@ -84,20 +84,6 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.738" />
 
-    <EditText
-        android:id="@+id/editTextTextLoginPassword"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="64dp"
-        android:layout_marginBottom="260dp"
-        android:ems="10"
-        android:inputType="textPassword"
-        android:text="nittalab"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.596" />
-
     <Button
         android:id="@+id/buttonSignUpRegister"
         android:layout_width="wrap_content"
@@ -110,4 +96,18 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <EditText
+        android:id="@+id/editTextTextSignUpPassword"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="64dp"
+        android:layout_marginBottom="260dp"
+        android:ems="10"
+        android:inputType="textPassword"
+        android:text="nittalab"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.598" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file