diff --git a/src/dev/peerat/backend/MailConfiguration.java b/src/dev/peerat/backend/MailConfiguration.java
deleted file mode 100644
index 464e163..0000000
--- a/src/dev/peerat/backend/MailConfiguration.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package dev.peerat.backend;
-
-public class MailConfiguration {
-	String username;
-	String password;
-	String smtpHost;
-	String smtpPort;
-	String fromAddress;
-	
-	public MailConfiguration(String initUsername, String initPassword, String initSmtpHost, String initSmtpPort, String initFromAddress) {
-		username = initUsername;
-		password = initPassword;
-		smtpHost = initSmtpHost;
-		smtpPort = initSmtpPort;
-		fromAddress = initFromAddress.isBlank() ? "cyberbottle@peerat.dev" : initFromAddress;
-	}
-
-	public String getUsername() {
-		return username;
-	}
-
-	public String getPassword() {
-		return password;
-	}
-
-	public String getSmtpHost() {
-		return smtpHost;
-	}
-
-	public String getSmtpPort() {
-		return smtpPort;
-	}
-	
-	public String getFromAddress() {
-		return fromAddress;
-	}
-	
-	
-}
diff --git a/src/dev/peerat/backend/utils/Mail.java b/src/dev/peerat/backend/utils/Mail.java
index 7163038..9323417 100644
--- a/src/dev/peerat/backend/utils/Mail.java
+++ b/src/dev/peerat/backend/utils/Mail.java
@@ -2,7 +2,6 @@ package dev.peerat.backend.utils;
 
 import java.util.Properties;
 
-import dev.peerat.backend.MailConfiguration;
 import jakarta.mail.Message;
 import jakarta.mail.MessagingException;
 import jakarta.mail.PasswordAuthentication;
@@ -13,25 +12,32 @@ import jakarta.mail.internet.MimeMessage;
 
 
 public class Mail {
-    public static void send(String toAddress, String subject, String text, MailConfiguration mailConfiguration) {
-
-        Properties props = new Properties();
+	private Session session;
+	private String fromAddress;
+	
+	public Mail(String initUsername, String initPassword, String initSmtpHost, String initSmtpPort, String initFromAddress) {
+		Properties props = new Properties();
         props.put("mail.smtp.starttls.enable", "true");
         props.put("mail.smtp.auth", "true");
-        props.put("mail.smtp.host", mailConfiguration.getSmtpHost());
-        props.put("mail.smtp.port", mailConfiguration.getSmtpPort());
+        props.put("mail.smtp.host", initSmtpHost);
+        props.put("mail.smtp.port", initSmtpPort);
 
-        Session session = Session.getInstance(props,
+        session = Session.getInstance(props,
           new jakarta.mail.Authenticator() {
             protected PasswordAuthentication getPasswordAuthentication() {
-                return new PasswordAuthentication(mailConfiguration.getUsername(), mailConfiguration.getPassword());
+                return new PasswordAuthentication(initUsername, initPassword);
             }
           });
-
+		
+		
+		fromAddress = initFromAddress.isBlank() ? "cyberbottle@peerat.dev" : initFromAddress;
+	}
+	
+    public void send(String toAddress, String subject, String text) {
         try {
 
             Message message = new MimeMessage(session);
-            message.setFrom(new InternetAddress(mailConfiguration.getFromAddress()));
+            message.setFrom(new InternetAddress(fromAddress));
             message.setRecipients(Message.RecipientType.TO,
                 InternetAddress.parse(toAddress));
             message.setSubject(subject);