diff --git a/pom.xml b/pom.xml
index 8048970b3..c46ef85f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
 
     <issueManagement>
         <system>GitHub</system>
-        <url>https://github.com/Xephi/AuthMeReloaded/issues</url>
+        <url>https://github.com/AuthMe/AuthMeReloaded/issues</url>
     </issueManagement>
 
     <licenses>
diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index d124f81eb..d796dd668 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -292,7 +292,7 @@ public class AuthMe extends JavaPlugin {
         HashAlgorithm hash = settings.getProperty(SecuritySettings.PASSWORD_HASH);
         if (OnStartupTasks.isHashDeprecatedIn54(hash)) {
             ConsoleLogger.warning("You are using an unsalted hash (" + hash + "). Support for this will be removed "
-                + "in 5.4 -- do you still need it? Comment on https://github.com/Xephi/AuthMeReloaded/issues/1016");
+                + "in 5.4 -- do you still need it? Comment on https://github.com/AuthMe/AuthMeReloaded/issues/1016");
         }
     }
 
diff --git a/src/main/java/fr/xephi/authme/datasource/DataSource.java b/src/main/java/fr/xephi/authme/datasource/DataSource.java
index c1c79a648..a1f50163a 100644
--- a/src/main/java/fr/xephi/authme/datasource/DataSource.java
+++ b/src/main/java/fr/xephi/authme/datasource/DataSource.java
@@ -75,7 +75,7 @@ public interface DataSource extends Reloadable {
      *
      * @param until The minimum last login
      * @param includeEntriesWithLastLoginZero Whether entries with lastlogin = 0 should be included or not,
-     *        see <a href="https://github.com/Xephi/AuthMeReloaded/issues/886">issue #886</a>
+     *        see <a href="https://github.com/AuthMe/AuthMeReloaded/issues/886">issue #886</a>
      * @return The account names selected to purge
      */
     Set<String> getRecordsToPurge(long until, boolean includeEntriesWithLastLoginZero);
diff --git a/src/main/java/fr/xephi/authme/initialization/OnStartupTasks.java b/src/main/java/fr/xephi/authme/initialization/OnStartupTasks.java
index b226afa16..902e28579 100644
--- a/src/main/java/fr/xephi/authme/initialization/OnStartupTasks.java
+++ b/src/main/java/fr/xephi/authme/initialization/OnStartupTasks.java
@@ -148,7 +148,7 @@ public class OnStartupTasks {
      *
      * @param hash the hash algorithm to check
      * @return true if the hash will be deprecated, false otherwise
-     * @see <a href="https://github.com/Xephi/AuthMeReloaded/issues/1016">#1016</a>
+     * @see <a href="https://github.com/AuthMe/AuthMeReloaded/issues/1016">#1016</a>
      */
     public static boolean isHashDeprecatedIn54(HashAlgorithm hash) {
         if (hash.getClazz() == null || hash == HashAlgorithm.PLAINTEXT) {
diff --git a/src/main/java/fr/xephi/authme/service/TeleportationService.java b/src/main/java/fr/xephi/authme/service/TeleportationService.java
index 65fd84044..8032df6f2 100644
--- a/src/main/java/fr/xephi/authme/service/TeleportationService.java
+++ b/src/main/java/fr/xephi/authme/service/TeleportationService.java
@@ -61,7 +61,7 @@ public class TeleportationService implements Reloadable {
      * Note: this is triggered by Bukkit's PlayerLoginEvent, during which you cannot use
      * {@link Player#hasPlayedBefore()}: it always returns {@code false}. We trigger teleportation
      * from the PlayerLoginEvent and not the PlayerJoinEvent to ensure that the location is overridden
-     * as fast as possible (cf. <a href="https://github.com/Xephi/AuthMeReloaded/issues/682">AuthMe #682</a>).
+     * as fast as possible (cf. <a href="https://github.com/AuthMe/AuthMeReloaded/issues/682">AuthMe #682</a>).
      *
      * @param player the player to process
      * @see <a href="https://bukkit.atlassian.net/browse/BUKKIT-3521">BUKKIT-3521: Player.hasPlayedBefore()