diff --git a/build.gradle b/build.gradle
index d987d83..fae61a8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 group 'sh.okx'
-version '3.2.1-beta.1'
+version '3.2.1-beta.2'
 
 repositories {
     mavenCentral()
@@ -23,7 +23,6 @@ repositories {
 
 dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
-    testCompile 'org.mockito:mockito-core:2.+'
 
     compileOnly 'org.projectlombok:lombok:1.18.2'
     apt "org.projectlombok:lombok:1.18.2"
diff --git a/src/main/java/sh/okx/rankup/AutoRankup.java b/src/main/java/sh/okx/rankup/AutoRankup.java
index ca420ce..1bd3423 100644
--- a/src/main/java/sh/okx/rankup/AutoRankup.java
+++ b/src/main/java/sh/okx/rankup/AutoRankup.java
@@ -12,10 +12,12 @@ public class AutoRankup extends BukkitRunnable {
   @Override
   public void run() {
     for (Player player : Bukkit.getOnlinePlayers()) {
-      if (rankup.checkRankup(player, false)) {
-        rankup.rankup(player);
-      } else if (rankup.getPrestiges() != null && rankup.checkPrestige(player, false)) {
-        rankup.prestige(player);
+      if(player.hasPermission("rankup.auto")) {
+        if (rankup.checkRankup(player, false)) {
+          rankup.rankup(player);
+        } else if (rankup.getPrestiges() != null && rankup.checkPrestige(player, false)) {
+          rankup.prestige(player);
+        }
       }
     }
   }
diff --git a/src/main/java/sh/okx/rankup/Rankup.java b/src/main/java/sh/okx/rankup/Rankup.java
index 8b51cfc..43a7f57 100644
--- a/src/main/java/sh/okx/rankup/Rankup.java
+++ b/src/main/java/sh/okx/rankup/Rankup.java
@@ -232,7 +232,7 @@ public class Rankup extends JavaPlugin {
         break;
       }
     }
-    
+
     return placeholders.getMoneyFormat().format(money) + suffix;
   }
 
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 39612a1..820f2a6 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: Rankup
-version: 3.2.1-beta.1
+version: 3.2.1-beta.2
 main: sh.okx.rankup.Rankup
 author: Okx
 depend: [Vault]
@@ -34,6 +34,7 @@ permissions:
             rankup.reload: true
             rankup.prestige: true
             rankup.prestiges: true
+            rankup.auto: true
     rankup.info:
         default: true
     rankup.rankup:
@@ -47,4 +48,6 @@ permissions:
     rankup.prestige:
         default: true
     rankup.prestiges:
+        default: true
+    rankup.auto:
         default: true
\ No newline at end of file
diff --git a/src/test/java/sh/okx/rankup/messages/MessageBuilderTest.java b/src/test/java/sh/okx/rankup/messages/MessageBuilderTest.java
new file mode 100644
index 0000000..8f85e38
--- /dev/null
+++ b/src/test/java/sh/okx/rankup/messages/MessageBuilderTest.java
@@ -0,0 +1,14 @@
+package sh.okx.rankup.messages;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.*;
+
+
+public class MessageBuilderTest {
+  @Test
+  public void testFailIfEmpty() {
+    assertThat(new MessageBuilder("").failIfEmpty(), instanceOf(EmptyMessageBuilder.class));
+  }
+}
\ No newline at end of file