diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/SignupService.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/SignupService.cs
index cf6fdae..cffc18f 100644
--- a/EuroTran/EasyBL.WEBAPP/ShowEasy/SignupService.cs
+++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/SignupService.cs
@@ -353,10 +353,16 @@ namespace EasyBL.WEBAPP.SYS
 
                         var Mailto = db.Queryable<SETB_CMS_Member>().First(x => x.Email == Email);
 
-                        if (Mailto.Status != "1")
+                    if (Mailto == null)
+                    {
+                        sError = @"帳號或密碼不正確";   //帳號或密碼不正確
+                        break;
+                    }
+
+                    if (Mailto.Status != "1")
                         {
 
-                            sError = @"該帳號未認證或已註銷";   //該帳號無效
+                            sError = Mailto.Status;   //該帳號無效
                             break;
 
                         }
@@ -381,7 +387,7 @@ namespace EasyBL.WEBAPP.SYS
                         var bSend = new MailService(sOrgID, true).MailFactory(oEmail, out sError);
 
                         srm = new SuccessResponseMessage(null, null);
-                        srm.DATA.Add(BLWording.REL, Mailto.Email);
+                        srm.DATA.Add(BLWording.REL, Mailto);
                     } while (false);
 
                 }
diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/SystemService.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/SystemService.cs
index 75a98f0..5a67f8b 100644
--- a/EuroTran/EasyBL.WEBAPP/ShowEasy/SystemService.cs
+++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/SystemService.cs
@@ -149,7 +149,7 @@ namespace EasyBL.WEBAPP.SYS
                     if (oUser.Status != @"1")
                     {
                         errorStaus = (int)StatusCodeEnum.Unauthorized;
-                        sError = @"該帳號未啓用";   //該帳號無效
+                        sError = oUser.Status;   //該帳號無效
                         break;
                     }