diff --git a/src/main/java/fr/xephi/authme/command/executable/register/RegisterCommand.java b/src/main/java/fr/xephi/authme/command/executable/register/RegisterCommand.java
index e06a35a3..d2185491 100644
--- a/src/main/java/fr/xephi/authme/command/executable/register/RegisterCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/register/RegisterCommand.java
@@ -180,17 +180,15 @@ public class RegisterCommand extends PlayerCommand {
                 @Override
                 public void run() {
                     if (dataSource.getAuth(player.getName()) != null) {
-                        if (dataSource.getAuth(player.getName()).getLastLogin() == null && (dataSource.getAuth(player.getName()).getRegistrationDate() + 600000) < System.currentTimeMillis()) {
+                        if (dataSource.getAuth(player.getName()).getLastLogin() == null) {
                             management.performUnregisterByAdmin(null, player.getName(), player);
                             timer.cancel();
-                        } else if (dataSource.getAuth(player.getName()).getLastLogin() != null) {
-                            timer.cancel();
                         }
                     } else {
                         timer.cancel();
                     }
                 }
-            }, 60000, 60000);
+            }, 600000);
         }
     }
 
diff --git a/src/main/resources/messages/messages_zhcn.yml b/src/main/resources/messages/messages_zhcn.yml
index 9d53e32e..bfbb2b3d 100644
--- a/src/main/resources/messages/messages_zhcn.yml
+++ b/src/main/resources/messages/messages_zhcn.yml
@@ -57,7 +57,7 @@ unregister:
 misc:
     account_not_activated: |-
       &a一封包含密码的邮件已发送至您的收件箱.
-      &a请在十分钟内完成激活,否则将注销此账户.
+      &a请在十分钟内完成登录,否则将注销此账户.
     not_activated: '&c账户未激活,请注册激活后再次尝试.'
     password_changed: '&a*** 密码已修改 ***'
     logout: '&a*** 已成功登出 ***'