diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index aaa4a00..baa2503 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,46 +4,14 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="ce59df2a-8d56-446a-867b-80e627daf479" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/dataSources.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.jar" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/gradlew" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/gradlew.bat" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/settings.gradle" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/alttd/forms/Main.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/alttd/forms/beans/WebConfig.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/alttd/forms/contact/ContactController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/alttd/forms/contact/ContactFormData.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/alttd/forms/contact/StoreFormQuery.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/alttd/forms/database/Database.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/alttd/forms/database/DatabaseConnection.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/alttd/forms/form/Form.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/alttd/forms/mail/MailSettings.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/alttd/forms/mail/mail_forms/MailForm.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/alttd/forms/mail/verification/VerificationResult.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/alttd/forms/mail/verification/Verify.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/alttd/forms/properties/JarPath.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/alttd/forms/properties/PropertiesLoader.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/alttd/forms/properties/PropertiesWriter.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/alttd/forms/verify_mail/FormQuery.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/alttd/forms/verify_mail/FormQueryResult.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/alttd/forms/verify_mail/VerificationData.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/alttd/forms/verify_mail/VerifyController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/META-INF/beans.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/META-INF/persistence.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/application-dev.properties" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/logback-spring.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/index.jsp" afterDir="false" />
+    <list default="true" id="ce59df2a-8d56-446a-867b-80e627daf479" name="Changes" comment="Mark fields as final in VerificationData and ContactFormData&#10;&#10;The 'code', 'eMail' fields in the VerificationData class and 'username', 'email', 'question' fields in the ContactFormData class are now marked as 'final'. At the same time, some unused imports from ContactController, ContactFormData, FormQuery, and VerifyController have been removed for code cleanliness.">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/alttd/forms/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alttd/forms/Main.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/alttd/forms/beans/WebConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alttd/forms/beans/WebConfig.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/alttd/forms/contact/ContactFormData.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alttd/forms/contact/ContactFormData.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/alttd/forms/database/Database.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alttd/forms/database/Database.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/alttd/forms/verify_mail/FormQuery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alttd/forms/verify_mail/FormQuery.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/alttd/forms/verify_mail/VerifyController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alttd/forms/verify_mail/VerifyController.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -82,6 +50,9 @@
   <component name="MarkdownSettingsMigration">
     <option name="stateVersion" value="1" />
   </component>
+  <component name="ProblemsViewState">
+    <option name="selectedTabId" value="ProjectErrors" />
+  </component>
   <component name="ProjectColorInfo">{
   &quot;associatedIndex&quot;: 7
 }</component>
@@ -91,39 +62,91 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "Gradle.Build forms.executor": "Run",
-    "RequestMappingsPanelOrder0": "0",
-    "RequestMappingsPanelOrder1": "1",
-    "RequestMappingsPanelWidth0": "75",
-    "RequestMappingsPanelWidth1": "75",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
-    "Spring Boot.Main.executor": "Debug",
-    "Tomcat Server.Tomcat 10.1.17.executor": "Run",
-    "git-widget-placeholder": "master",
-    "ignore.virus.scanning.warn.message": "true",
-    "kotlin-language-version-configured": "true",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "project.structure.last.edited": "Project",
-    "project.structure.proportion": "0.0",
-    "project.structure.side.proportion": "0.0",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;Gradle.Build forms.executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.TestForm.testFunctions.executor&quot;: &quot;Debug&quot;,
+    &quot;Gradle.TestForm.testRetrieveForm.executor&quot;: &quot;Run&quot;,
+    &quot;RequestMappingsPanelOrder0&quot;: &quot;0&quot;,
+    &quot;RequestMappingsPanelOrder1&quot;: &quot;1&quot;,
+    &quot;RequestMappingsPanelWidth0&quot;: &quot;75&quot;,
+    &quot;RequestMappingsPanelWidth1&quot;: &quot;75&quot;,
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
+    &quot;Spring Boot.Main.executor&quot;: &quot;Run&quot;,
+    &quot;Tomcat Server.Tomcat 10.1.17.executor&quot;: &quot;Run&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
+    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
+    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;Project&quot;,
+    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
+    &quot;project.structure.side.proportion&quot;: &quot;0.0&quot;,
+    &quot;run.code.analysis.last.selected.profile&quot;: &quot;pProject Default&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.lookFeel&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   },
-  "keyToStringList": {
-    "DatabaseDriversLRU": [
-      "mysql",
-      "mariadb"
+  &quot;keyToStringList&quot;: {
+    &quot;DatabaseDriversLRU&quot;: [
+      &quot;mysql&quot;,
+      &quot;mariadb&quot;
     ]
   }
-}]]></component>
+}</component>
   <component name="RunManager" selected="Spring Boot.Main">
+    <configuration name="TestForm.testFunctions" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
+      <ExternalSystemSettings>
+        <option name="executionName" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="externalSystemIdString" value="GRADLE" />
+        <option name="scriptParameters" value="" />
+        <option name="taskDescriptions">
+          <list />
+        </option>
+        <option name="taskNames">
+          <list>
+            <option value=":test" />
+            <option value="--tests" />
+            <option value="&quot;TestForm.testFunctions&quot;" />
+          </list>
+        </option>
+        <option name="vmOptions" />
+      </ExternalSystemSettings>
+      <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
+      <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+      <DebugAllEnabled>false</DebugAllEnabled>
+      <RunAsTest>true</RunAsTest>
+      <method v="2" />
+    </configuration>
+    <configuration name="TestForm.testRetrieveForm" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
+      <ExternalSystemSettings>
+        <option name="executionName" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="externalSystemIdString" value="GRADLE" />
+        <option name="scriptParameters" value="" />
+        <option name="taskDescriptions">
+          <list />
+        </option>
+        <option name="taskNames">
+          <list>
+            <option value=":test" />
+            <option value="--tests" />
+            <option value="&quot;TestForm.testRetrieveForm&quot;" />
+          </list>
+        </option>
+        <option name="vmOptions" />
+      </ExternalSystemSettings>
+      <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
+      <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+      <DebugAllEnabled>false</DebugAllEnabled>
+      <RunAsTest>true</RunAsTest>
+      <method v="2" />
+    </configuration>
     <configuration name="Main" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
       <option name="ACTIVE_PROFILES" value="dev" />
       <module name="forms.main" />
@@ -171,9 +194,17 @@
       </method>
     </configuration>
     <list>
+      <item itemvalue="Gradle.TestForm.testFunctions" />
+      <item itemvalue="Gradle.TestForm.testRetrieveForm" />
       <item itemvalue="Spring Boot.Main" />
       <item itemvalue="Tomcat Server.Tomcat 10.1.17" />
     </list>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Gradle.TestForm.testRetrieveForm" />
+        <item itemvalue="Gradle.TestForm.testFunctions" />
+      </list>
+    </recent_temporary>
   </component>
   <component name="SharedIndexes">
     <attachedChunks>
@@ -195,11 +226,76 @@
       <workItem from="1704629811001" duration="6145000" />
       <workItem from="1704639914630" duration="2938000" />
       <workItem from="1704742191416" duration="685000" />
-      <workItem from="1705152717665" duration="5692000" />
+      <workItem from="1705152717665" duration="6704000" />
+      <workItem from="1705220399998" duration="6067000" />
+      <workItem from="1705262555334" duration="590000" />
+      <workItem from="1707329373408" duration="2000" />
+      <workItem from="1707329426177" duration="24000" />
+      <workItem from="1707417916223" duration="855000" />
+      <workItem from="1707418804088" duration="1078000" />
+      <workItem from="1707560440225" duration="1006000" />
+      <workItem from="1707643318784" duration="1003000" />
+      <workItem from="1707646300783" duration="1325000" />
+      <workItem from="1707656217023" duration="2305000" />
+      <workItem from="1708153393312" duration="669000" />
+      <workItem from="1708154142819" duration="609000" />
+      <workItem from="1714315469459" duration="3062000" />
     </task>
+    <task id="LOCAL-00001" summary="Initial commit for site for forms">
+      <option name="closed" value="true" />
+      <created>1705159506039</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1705159506039</updated>
+    </task>
+    <task id="LOCAL-00002" summary="Refactor code to use Form objects instead of JSON strings&#10;&#10;Several parts of the code have been altered to use Form objects instead of JSON strings. Changes include updating the FormQueryResult record type to hold an Optional&lt;Form&gt; instead of an Optional&lt;String&gt;, altering methods in the StoreFormQuery class to insert Form data into the database and replacing JSON handling methods in the FormQuery class with Form object oriented methods. A 'form_class' field has also been added to the 'form' table in the database to aid form identification and reconstruction from stored data.">
+      <option name="closed" value="true" />
+      <created>1705226962796</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1705226962796</updated>
+    </task>
+    <task id="LOCAL-00003" summary="Add TestForm class and set up related unit tests&#10;&#10;The changes add a new TestForm class to implement unit tests for form handling in the application. The included tests verify the storing, retrieving, and verification of forms from a database, as well as form object creation and confirmation of form data. This is a step towards improving the code's reliability and making it easier to catch potential bugs or issues.">
+      <option name="closed" value="true" />
+      <created>1705226977031</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1705226977031</updated>
+    </task>
+    <task id="LOCAL-00004" summary="Mark fields as final in VerificationData and ContactFormData&#10;&#10;The 'code', 'eMail' fields in the VerificationData class and 'username', 'email', 'question' fields in the ContactFormData class are now marked as 'final'. At the same time, some unused imports from ContactController, ContactFormData, FormQuery, and VerifyController have been removed for code cleanliness.">
+      <option name="closed" value="true" />
+      <created>1705227608210</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1705227608210</updated>
+    </task>
+    <option name="localTasksCounter" value="5" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="3" />
   </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="Initial commit for site for forms" />
+    <MESSAGE value="Refactor code to use Form objects instead of JSON strings&#10;&#10;Several parts of the code have been altered to use Form objects instead of JSON strings. Changes include updating the FormQueryResult record type to hold an Optional&lt;Form&gt; instead of an Optional&lt;String&gt;, altering methods in the StoreFormQuery class to insert Form data into the database and replacing JSON handling methods in the FormQuery class with Form object oriented methods. A 'form_class' field has also been added to the 'form' table in the database to aid form identification and reconstruction from stored data." />
+    <MESSAGE value="Add TestForm class and set up related unit tests&#10;&#10;The changes add a new TestForm class to implement unit tests for form handling in the application. The included tests verify the storing, retrieving, and verification of forms from a database, as well as form object creation and confirmation of form data. This is a step towards improving the code's reliability and making it easier to catch potential bugs or issues." />
+    <MESSAGE value="Remove unnecessary Gson imports in ContactFormData&#10;&#10;The Gson and GsonBuilder imports in the ContactFormData class were unused and have been removed. This cleanup simplifies the code and reduces unnecessary dependencies.&#10;" />
+    <MESSAGE value="Mark fields as final in VerificationData and ContactFormData&#10;&#10;The 'code', 'eMail' fields in the VerificationData class and 'username', 'email', 'question' fields in the ContactFormData class are now marked as 'final'. At the same time, some unused imports from ContactController, ContactFormData, FormQuery, and VerifyController have been removed for code cleanliness." />
+    <option name="LAST_COMMIT_MESSAGE" value="Mark fields as final in VerificationData and ContactFormData&#10;&#10;The 'code', 'eMail' fields in the VerificationData class and 'username', 'email', 'question' fields in the ContactFormData class are now marked as 'final'. At the same time, some unused imports from ContactController, ContactFormData, FormQuery, and VerifyController have been removed for code cleanliness." />
+  </component>
 </project>
\ No newline at end of file
diff --git a/src/main/java/com/alttd/forms/Main.java b/src/main/java/com/alttd/forms/Main.java
index d7a66a5..0f6767b 100644
--- a/src/main/java/com/alttd/forms/Main.java
+++ b/src/main/java/com/alttd/forms/Main.java
@@ -3,10 +3,11 @@ package com.alttd.forms;
 import com.alttd.forms.database.DatabaseConnection;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.validation.ValidationAutoConfiguration;
 
 import java.sql.SQLException;
 
-@SpringBootApplication
+@SpringBootApplication(exclude = ValidationAutoConfiguration.class)
 public class Main {
 
     public static void main(String[] args) throws SQLException {
diff --git a/src/main/java/com/alttd/forms/beans/WebConfig.java b/src/main/java/com/alttd/forms/beans/WebConfig.java
index 8b1f400..c8b8f73 100644
--- a/src/main/java/com/alttd/forms/beans/WebConfig.java
+++ b/src/main/java/com/alttd/forms/beans/WebConfig.java
@@ -7,7 +7,7 @@ import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Configuration
-public class WebConfig implements WebMvcConfigurer {
+public class WebConfig implements WebMvcConfigurer { //TODO this can be done with annotations
 
     @Bean
     public WebMvcConfigurer corsConfigurer() {
diff --git a/src/main/java/com/alttd/forms/contact/ContactFormData.java b/src/main/java/com/alttd/forms/contact/ContactFormData.java
index 6283d4f..d006104 100644
--- a/src/main/java/com/alttd/forms/contact/ContactFormData.java
+++ b/src/main/java/com/alttd/forms/contact/ContactFormData.java
@@ -38,19 +38,26 @@ public class ContactFormData extends Form {
 
     @Override
     public String toHtml() {
-        return "<div style='margin: 10px; padding: 10px; border: 1px solid #000; width: 300px;'>" +
-                "<p><strong>Username:</strong><br>" +
-                "<span style='color: #007BFF;'>" +
-                username +
-                "</span></p>" +
-                "<p><strong>Email:</strong><br>" +
-                "<span style='color: #007BFF;'>" +
-                email +
-                "</span></p>" +
-                "<p><strong>Question:</strong><br>" +
-                "<span style='color: #007BFF;'>" +
-                question +
-                "</span></p>" +
-                "</div>";
+        StringBuilder htmlOutput = new StringBuilder();
+
+        htmlOutput.append("<table style='border-collapse: collapse; width: 100%;'>");
+
+        String[] fields = {"Username", "Email", "Question"};
+        String[] values = {username, email, question};
+
+        for (int i = 0; i < fields.length; i++) {
+            htmlOutput.append("<tr style='border: 1px solid #ddd;'>");
+            htmlOutput.append("<td style='border: 1px solid #ddd; padding: 10px; font-weight: bold;'>");
+            htmlOutput.append(fields[i]);
+            htmlOutput.append("</td>");
+            htmlOutput.append("<td style='border: 1px solid #ddd; padding: 10px;'>");
+            htmlOutput.append(values[i]);
+            htmlOutput.append("</td>");
+            htmlOutput.append("</tr>");
+        }
+
+        htmlOutput.append("</table>");
+
+        return htmlOutput.toString();
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/alttd/forms/database/Database.java b/src/main/java/com/alttd/forms/database/Database.java
index ebd8117..5516d82 100644
--- a/src/main/java/com/alttd/forms/database/Database.java
+++ b/src/main/java/com/alttd/forms/database/Database.java
@@ -8,7 +8,7 @@ import java.sql.SQLException;
 
 public class Database {
 
-    private static final Logger logger = LoggerFactory.getLogger(Database.class);
+    private static final Logger logger = LoggerFactory.getLogger(Database.class); //TODO can be replaced with library and that one db file that creates the db
 
     public static void createTables() {
         String[] createTables = {
diff --git a/src/main/java/com/alttd/forms/verify_mail/FormQuery.java b/src/main/java/com/alttd/forms/verify_mail/FormQuery.java
index 0d60ea4..9444433 100644
--- a/src/main/java/com/alttd/forms/verify_mail/FormQuery.java
+++ b/src/main/java/com/alttd/forms/verify_mail/FormQuery.java
@@ -37,7 +37,7 @@ public class FormQuery {
     }
 
     private Optional<Form> getFormForId(Connection connection, int formId) throws SQLException {
-        String sql = "SELECT form_json FROM form WHERE formId = ?";
+        String sql = "SELECT form_json, form_class FROM form WHERE formId = ?";
 
         try (PreparedStatement stmt = connection.prepareStatement(sql)) {
             stmt.setInt(1, formId);
diff --git a/src/main/java/com/alttd/forms/verify_mail/VerifyController.java b/src/main/java/com/alttd/forms/verify_mail/VerifyController.java
index 5b5266c..503e895 100644
--- a/src/main/java/com/alttd/forms/verify_mail/VerifyController.java
+++ b/src/main/java/com/alttd/forms/verify_mail/VerifyController.java
@@ -10,6 +10,13 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.nio.charset.StandardCharsets;
 import java.util.concurrent.CompletableFuture;
 
 @RestController
@@ -23,6 +30,27 @@ public class VerifyController {
         logger.debug(verificationData.toString());
         return new FormQuery().getFormForCode(verificationData.code, verificationData.eMail).thenApply(result -> result.form()
                 .map(form -> {
+                    try {
+                        HttpRequest request = HttpRequest.newBuilder()
+                                .uri(new URI("http://51.222.255.92:8001/api/contact/submitContactForm"))//TODO get uri from form
+                                .header("Content-Type", "application/json;charset=UTF-8")
+                                .POST(HttpRequest.BodyPublishers.ofString(form.toJsonString(), StandardCharsets.UTF_8))
+                                .build();
+                        HttpClient client = HttpClient.newHttpClient();
+                        HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
+                        if (response.statusCode() < 200 || response.statusCode() > 200) {
+                            logger.error(String.format("Failed to send form to Discord. Got status code [%d], with body\n%s", response.statusCode(), response.body()));
+                            //TODO handle failure
+                            //TODO strings to config
+                            return ResponseEntity.ok("Failed to send form to Discord, please contact us at admin@alttd.com");
+                        }
+                    } catch (URISyntaxException e) {
+                        logger.error("Unable to create URI for posting form", e); //TODO more clear
+                        return ResponseEntity.ok("Unable to create URI for posting form, please contact us at admin@alttd.com");
+                    } catch (IOException | InterruptedException e) {
+                        logger.error("Unable to send form to Discord", e); //TODO more clear
+                        return ResponseEntity.ok("Unable to send form to Discord, please contact us at admin@alttd.com");
+                    }
                     MailForm.sendForm("akastijn@alttd.com", form);
                     return ResponseEntity.ok(form.toJsonString());
                 })