diff --git a/app/src/main/java/org/ntlab/amaryllis/client/LoginActivity.java b/app/src/main/java/org/ntlab/amaryllis/client/LoginActivity.java
index cab47de..ca6fa98 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/LoginActivity.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/LoginActivity.java
@@ -45,9 +45,10 @@
         uidTextView = findViewById(R.id.uid);
         loginButton = (Button)findViewById(R.id.login);
         loginButton.setEnabled(false);
+        uidEditText.setText( ((Amaryllis) getApplication()).getUid());
         loginButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
-               Call<LoginJson> call = LoginService.accountLogin(passWordEditText.getText().toString(),uidEditText.getText().toString());
+               Call<LoginJson> call = LoginService.accountLogin(uidEditText.getText().toString(),passWordEditText.getText().toString());
                 call.enqueue(new Callback<LoginJson>(){
                     @Override
                     public void onResponse(Call<LoginJson> call, Response<LoginJson> response) {
@@ -79,7 +80,7 @@
 
     @Override
     public void afterTextChanged(Editable s) {
-        if(passWordTextView.length()>7 && uidTextView.length()>0 ){
+        if(passWordTextView.length()>3 && uidTextView.length()>0 ){
             loginButton.setEnabled(true);
         }
         else{