diff --git a/src/main/java/com/jamesquinley/Asecure/electronicMailHandler.java b/src/main/java/com/jamesquinley/Asecure/electronicMailHandler.java
index 461a97f..9f068ec 100644
--- a/src/main/java/com/jamesquinley/Asecure/electronicMailHandler.java
+++ b/src/main/java/com/jamesquinley/Asecure/electronicMailHandler.java
@@ -53,6 +53,7 @@ public class electronicMailHandler {
         } catch (Exception e) {
             e.printStackTrace();
             System.err.println("Email ONBOARD Not sent due to an error");
+            secureCalls.banAction(receiverEmail);
             if (e instanceof SendFailedException) {
                secureCalls.banAction(receiverEmail);
             }
diff --git a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java
index a5f8a70..29a73be 100644
--- a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java
+++ b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java
@@ -516,6 +516,8 @@ public class delegationServices {
                                         else
                                         {
                                             System.out.println("RS14");
+                                            System.out.println(password + "From Client");
+                                            System.out.println(Password + "From Trusted Server");
                                             if (Password.equals(password)) {
                                                 System.out.println("R3c");
                                                 Token = (int) accountServer.get("Token");
@@ -568,7 +570,7 @@ public class delegationServices {
                                                 BasicDBObject updateQuery = new BasicDBObject();
                                                 BasicDBObject updateQuery1 = new BasicDBObject();
                                                 updateQuery.append("$set",
-                                                        new BasicDBObject().append("type", 7));
+                                                        new BasicDBObject().append("type", 9));
                                                 updateQuery1.append("$set",
                                                         new BasicDBObject().append("status", true));
                                                 dCollection.updateOne(searchQuery, updateQuery);
@@ -600,7 +602,7 @@ public class delegationServices {
                                     BasicDBObject updateQuery = new BasicDBObject();
                                     BasicDBObject updateQuery1 = new BasicDBObject();
                                     updateQuery.append("$set",
-                                            new BasicDBObject().append("type", 9));
+                                            new BasicDBObject().append("type", 7));
                                     updateQuery1.append("$set",
                                             new BasicDBObject().append("status", true));
                                     dCollection.updateOne(searchQuery, updateQuery);
@@ -1108,94 +1110,53 @@ public class delegationServices {
                                                     System.out.println("UUID Free (While EXP)" + exDr);
                                                 }
                                             }
-                                            System.out.println("Token & UUID Free (Main)");
-                                            System.out.println("Creating.");
-                                            Document createForm = new Document();
-                                            Document FnetInit = new Document();
-                                            createForm.append("User", User);
-                                            createForm.append("Password", Password);
-                                            createForm.append("Status", true);
-                                            createForm.append("Flagged", false);
-                                            createForm.append("Email", Email);
-                                            createForm.append("FName", FName);
-                                            createForm.append("Entitlements", "NA");
-                                            createForm.append("Path", "C:\\ObsidianCoreStudios\\Application\\");
-                                            createForm.append("Freinds", " ");
-                                            createForm.append("Token", tokenSTGEN);
-                                            createForm.append("UUID", UUID);
-                                            createForm.append("Control", 1);
-                                            createForm.append("Upgrade", 0);
-                                            createForm.append("Version","2");
-                                            createForm.append("keyStatus", false);
-                                            //createForm.append("Uid",uid);
-                                            createForm.append("lastNet", Macid);
-                                            accountS.insertOne(createForm);
-                                            FnetInit.append("User", User);
-                                            FnetInit.append("Status", true);
-                                            FnetInit.append("Friends", " ");
-                                            FnetInit.append("Token", tokenSTGEN);
-                                            FnetInit.append("UUID", UUID);
-                                            FnetInit.append("Control", 1);
-                                            FNETDOC.insertOne(FnetInit);
-                                            BasicDBObject searchQuery = new BasicDBObject();
-                                            searchQuery.append("clientid", ClientID);
-                                            electronicMailHandler.Onboarding(Email, User);
-                                            BasicDBObject updateQuery = new BasicDBObject();
-                                            BasicDBObject updateQuery1 = new BasicDBObject();
-                                            updateQuery.append("$set",
-                                                    new BasicDBObject().append("type", 4));
-                                            updateQuery1.append("$set",
-                                                    new BasicDBObject().append("status", true));
-                                            dCollection.updateOne(searchQuery, updateQuery);
-                                            dCollection.updateOne(searchQuery, updateQuery1);
-                                            System.out.println("Update Request With Finished Status");
-                                            delegationTimer.DeleteTargetRequest(ClientID);
                                         } catch (NullPointerException uuid) {
-                                            System.out.println("Token & UUID Free (Main)");
-                                            System.out.println("Creating.");
-                                            Document createForm = new Document();
-                                            Document FnetInit = new Document();
-                                            createForm.append("User", User);
-                                            createForm.append("Password", Password);
-                                            createForm.append("Status", true);
-                                            createForm.append("Flagged", false);
-                                            createForm.append("Email", Email);
-                                            createForm.append("FName", FName);
-                                            createForm.append("Entitlements", "NA");
-                                            createForm.append("Path", "C:\\ObsidianCoreStudios\\Application\\");
-                                            createForm.append("Freinds", " ");
-                                            createForm.append("Token", tokenSTGEN);
-                                            createForm.append("UUID", UUID);
-                                            createForm.append("Control", 1);
-                                            createForm.append("Upgrade", 0);
-                                            createForm.append("Version","2");
-                                            createForm.append("keyStatus", false);
-                                            //createForm.append("Uid",uid);
-                                            createForm.append("lastNet", Macid);
-                                            accountS.insertOne(createForm);
-                                            FnetInit.append("User", User);
-                                            FnetInit.append("Status", true);
-                                            FnetInit.append("Friends", " ");
-                                            FnetInit.append("Token", tokenSTGEN);
-                                            FnetInit.append("UUID", UUID);
-                                            FnetInit.append("Control", 1);
-                                            FNETDOC.insertOne(FnetInit);
-                                            BasicDBObject searchQuery = new BasicDBObject();
-                                            searchQuery.append("clientid", ClientID);
-                                            electronicMailHandler.Onboarding(Email, User);
-                                            BasicDBObject updateQuery = new BasicDBObject();
-                                            BasicDBObject updateQuery1 = new BasicDBObject();
-                                            updateQuery.append("$set",
-                                                    new BasicDBObject().append("type", 4));
-                                            updateQuery1.append("$set",
-                                                    new BasicDBObject().append("status", true));
-                                            dCollection.updateOne(searchQuery, updateQuery);
-                                            dCollection.updateOne(searchQuery, updateQuery1);
-                                            System.out.println("Update Request With Finished Status");
-                                            delegationTimer.DeleteTargetRequest(ClientID);
+                                            System.out.println("UUID Free");
+                                        }
+                                        System.out.println("Token Free");
+                                        System.out.println("Token & UUID Free (Main)");
+                                        System.out.println("Creating.");
+                                        Document createForm = new Document();
+                                        Document FnetInit = new Document();
+                                        createForm.append("User", User);
+                                        createForm.append("Password", Password);
+                                        createForm.append("Status", true);
+                                        createForm.append("Flagged", false);
+                                        createForm.append("Email", Email);
+                                        createForm.append("FName", FName);
+                                        createForm.append("Entitlements", "NA");
+                                        createForm.append("Path", "C:\\ObsidianCoreStudios\\Application\\");
+                                        createForm.append("Freinds", " ");
+                                        createForm.append("Token", tokenSTGEN);
+                                        createForm.append("UUID", UUID);
+                                        createForm.append("Control", 1);
+                                        createForm.append("Upgrade", 0);
+                                        createForm.append("Version","2");
+                                        createForm.append("keyStatus", false);
+                                        //createForm.append("Uid",uid);
+                                        createForm.append("lastNet", Macid);
+                                        accountS.insertOne(createForm);
+                                        FnetInit.append("User", User);
+                                        FnetInit.append("Status", true);
+                                        FnetInit.append("Friends", " ");
+                                        FnetInit.append("Token", tokenSTGEN);
+                                        FnetInit.append("UUID", UUID);
+                                        FnetInit.append("Control", 1);
+                                        FNETDOC.insertOne(FnetInit);
+                                        BasicDBObject searchQuery = new BasicDBObject();
+                                        searchQuery.append("clientid", ClientID);
+                                        electronicMailHandler.Onboarding(Email, User);
+                                        BasicDBObject updateQuery = new BasicDBObject();
+                                        BasicDBObject updateQuery1 = new BasicDBObject();
+                                        updateQuery.append("$set",
+                                                new BasicDBObject().append("type", 4));
+                                        updateQuery1.append("$set",
+                                                new BasicDBObject().append("status", true));
+                                        dCollection.updateOne(searchQuery, updateQuery);
+                                        dCollection.updateOne(searchQuery, updateQuery1);
+                                        System.out.println("Update Request With Finished Status");
+                                        delegationTimer.DeleteTargetRequest(ClientID);
                                         }
-
-                                    }
 
                                 }
                             }