diff --git a/pom.xml b/pom.xml
index fc16d564..7c867632 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,86 +136,92 @@
 					<source>1.7</source>
 					<target>${javaVersion}</target>
 				</configuration>
-			</plugin>
+                        </plugin>
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-shade-plugin</artifactId>
-				<version>2.4.3</version>
-                <configuration>
-                    <createDependencyReducedPom>false</createDependencyReducedPom>
-                    <minimizeJar>false</minimizeJar>
-                    <relocations>
-                        <relocation>
-                            <pattern>org.mcstats</pattern>
-                            <shadedPattern>fr.xephi.authme</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>org.apache</pattern>
-                            <shadedPattern>fr.xephi.authme.libs.apache</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>javax</pattern>
-                            <shadedPattern>fr.xephi.authme.libs.javax</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>com.sun</pattern>
-                            <shadedPattern>fr.xephi.authme.libs.sun</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>com.google</pattern>
-                            <shadedPattern>fr.xephi.authme.libs.google</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>com.zaxxer.hikari</pattern>
-                            <shadedPattern>fr.xephi.authme.libs.hikari</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>org.slf4j</pattern>
-                            <shadedPattern>fr.xephi.authme.libs.slf4j</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>com.maxmind.geoip</pattern>
-                            <shadedPattern>fr.xephi.authme.libs.geoip</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>net.ricecode.similarity</pattern>
-                            <shadedPattern>fr.xephi.authme.libs.similarity</shadedPattern>
-                        </relocation>
-                    </relocations>
-                </configuration>
-				<executions>
-					<execution>
-                        <id>spigot-shade</id>
-						<phase>package</phase>
-						<goals>
-							<goal>shade</goal>
-						</goals>
-                        <configuration>
-                            <outputFile>target/${jarName}-spigot.jar</outputFile>
-                            <artifactSet>
-                                <excludes>
-                                    <exclude>com.google.guava:guava</exclude>
-                                </excludes>
-                            </artifactSet>
-                        </configuration>
-					</execution>
-					<execution>
-                        <id>legacy-shade</id>
-						<phase>package</phase>
-						<goals>
-							<goal>shade</goal>
-						</goals>
-                        <configuration>
-                            <outputFile>target/${jarName}-legacy.jar</outputFile>
-                        </configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-shade-plugin</artifactId>
+                            <version>2.4.3</version>
+                            <configuration>
+                                <createDependencyReducedPom>false</createDependencyReducedPom>
+                                <minimizeJar>false</minimizeJar>
+                                <relocations>
+                                    <relocation>
+                                        <pattern>org.mcstats</pattern>
+                                        <shadedPattern>fr.xephi.authme</shadedPattern>
+                                    </relocation>
+                                    <relocation>
+                                        <pattern>org.apache</pattern>
+                                        <shadedPattern>fr.xephi.authme.libs.apache</shadedPattern>
+                                    </relocation>
+                                    <relocation>
+                                        <pattern>javax.mail</pattern>
+                                        <shadedPattern>fr.xephi.authme.libs.javax.mail</shadedPattern>
+                                    </relocation>
+                                    <relocation>
+                                        <pattern>javax.activation</pattern>
+                                        <shadedPattern>fr.xephi.authme.libs.javax.activation</shadedPattern>
+                                    </relocation>
+                                    <relocation>
+                                        <pattern>com.sun</pattern>
+                                        <shadedPattern>fr.xephi.authme.libs.sun</shadedPattern>
+                                    </relocation>
+                                    <relocation>
+                                        <pattern>com.zaxxer.hikari</pattern>
+                                        <shadedPattern>fr.xephi.authme.libs.hikari</shadedPattern>
+                                    </relocation>
+                                    <relocation>
+                                        <pattern>org.slf4j</pattern>
+                                        <shadedPattern>fr.xephi.authme.libs.slf4j</shadedPattern>
+                                    </relocation>
+                                    <relocation>
+                                        <pattern>com.maxmind.geoip</pattern>
+                                        <shadedPattern>fr.xephi.authme.libs.geoip</shadedPattern>
+                                    </relocation>
+                                    <relocation>
+                                        <pattern>net.ricecode.similarity</pattern>
+                                        <shadedPattern>fr.xephi.authme.libs.similarity</shadedPattern>
+                                    </relocation>
+                                </relocations>
+                            </configuration>
+                            <executions>
+                                <execution>
+                                    <id>spigot-shade</id>
+                                    <phase>package</phase>
+                                    <goals>
+                                        <goal>shade</goal>
+                                    </goals>
+                                    <configuration>
+                                        <artifactSet>
+                                            <excludes>
+                                                <exclude>com.google.guava:guava</exclude>
+                                                <exclude>com.google.code.gson:gson</exclude>
+                                            </excludes>
+                                        </artifactSet>
+                                        <outputFile>target/${jarName}-spigot.jar</outputFile>
+                                    </configuration>
+                                </execution>
+                                <execution>
+                                    <id>legacy-shade</id>
+                                    <phase>package</phase>
+                                    <goals>
+                                        <goal>shade</goal>
+                                    </goals>
+                                    <configuration>
+                                        <relocations>
+                                            <relocation>
+                                                <pattern>com.google</pattern>
+                                                <shadedPattern>fr.xephi.authme.libs.google</shadedPattern>
+                                            </relocation>
+                                        </relocations>
+                                        <outputFile>target/${jarName}-legacy.jar</outputFile>
+                                    </configuration>
+                                </execution>
+                            </executions>
+                        </plugin>
+                        <plugin>
+                            <groupId>org.jacoco</groupId>
+                            <artifactId>jacoco-maven-plugin</artifactId>
 				<version>0.7.5.201505241946</version>
 				<executions>
 					<execution>