diff --git a/src/main/java/com/fstack/event/RegistrationListener.java b/src/main/java/com/fstack/event/RegistrationListener.java
index b21b80f74a7360739121c4d44fa2667dddbeb2b5..c09e3f78c117c22d9a822fc3a13472752427115b 100644
--- a/src/main/java/com/fstack/event/RegistrationListener.java
+++ b/src/main/java/com/fstack/event/RegistrationListener.java
@@ -23,7 +23,7 @@ public class RegistrationListener implements ApplicationListener<OnRegistrationC
 
     private static final String VERIFICATION_EMAIL_FROM_ADDR = "look7788ab@163.com";
 
-    private static final String VERIFICATION_EMAIL_SUBJECT = "私人论坛用户注册确认";
+    private static final String VERIFICATION_EMAIL_SUBJECT = "论坛用户注册激活邮件";
 
     private static final String CONFIRM_ENDPOINT = "registration-confirm";
 
@@ -66,7 +66,7 @@ public class RegistrationListener implements ApplicationListener<OnRegistrationC
         System.out.println("confirmation link >> " + confirmationLink);
         email.setFrom(VERIFICATION_EMAIL_FROM_ADDR);
         email.setSubject(VERIFICATION_EMAIL_SUBJECT);
-        email.setText("请及时激活您的账号，该链接24小时内有效===> " + confirmationLink);
+        email.setText("请及时激活您的账号，该链接24小时内有效===>   " + confirmationLink + "   (友情提示：请不要删除这个邮件哦，可能以后还会用到的~)");
         email.setTo(user.getEmail());
         this.emailService.sendEmail(email);
     }
diff --git a/src/main/java/com/fstack/service/impl/UserServiceImpl.java b/src/main/java/com/fstack/service/impl/UserServiceImpl.java
index 3b096f6075d34ac0b7239f5dc92973283cb0ddaa..ee93ca720571c131d9d51d8e4a0ba8e02c56998d 100644
--- a/src/main/java/com/fstack/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/fstack/service/impl/UserServiceImpl.java
@@ -212,9 +212,9 @@ public class UserServiceImpl implements UserService {
         VerificationToken byUserId = this.verificationTokenMapper.findByUserId(user.getId().toString());
         if (null != byUserId && byUserId.getToken().equalsIgnoreCase(userPwdDto.getToken())) {
             user.setPassword(this.passwordEncoder.encode(userPwdDto.getPassword()));
-            int update = this.userMapper.update(user);
-            if (update > 0) attributes.put("updateUserPwdResult", "success");
-            else attributes.put("updateUserPwdResult", "failure");
+            if (user.getActivated() == 0L) user.activated(true);
+            this.userMapper.update(user);
+            attributes.put("updateUserPwdResult", "success");
         } else {
             attributes.put("updateUserPwdResult", "failure");
         }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 114b05eafa36010c22a9048b9fb53e06173c434f..74be025edaf27bf58066d625ff4892e93aa2790d 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 server.port=9999
-spring.profiles.active= pro
+spring.profiles.active= local
 server.servlet.context-path= /
 spring.aop.proxy-target-class=true
 spring.jackson.time-zone= GMT+8