diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index 82697f2d..c86d9ecd 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -775,6 +775,6 @@ public class AuthMe extends JavaPlugin {
             database = new CacheDataSource(this, database);
         }
 
-        database = new DatabaseCalls(this, database);
+        database = new DatabaseCalls(database);
     }
 }
diff --git a/src/main/java/fr/xephi/authme/SendMailSSL.java b/src/main/java/fr/xephi/authme/SendMailSSL.java
index 1927071f..4a0c9dd8 100644
--- a/src/main/java/fr/xephi/authme/SendMailSSL.java
+++ b/src/main/java/fr/xephi/authme/SendMailSSL.java
@@ -82,7 +82,7 @@ public class SendMailSSL {
                     // Generate an image ?
                     File file = null;
                     if (Settings.generateImage) {
-                        ImageGenerator gen = new ImageGenerator(plugin, newPass);
+                        ImageGenerator gen = new ImageGenerator(newPass);
                         file = new File(plugin.getDataFolder() + File.separator + auth.getNickname() + "_new_pass.jpg");
                         ImageIO.write(gen.generateImage(), "jpg", file);
                         messageBodyPart = new MimeBodyPart();