diff --git a/client/src/main/java/org/dreamexposure/discal/client/network/google/GoogleExternalAuth.java b/client/src/main/java/org/dreamexposure/discal/client/network/google/GoogleExternalAuth.java
index 60b3da82..1c9dec58 100644
--- a/client/src/main/java/org/dreamexposure/discal/client/network/google/GoogleExternalAuth.java
+++ b/client/src/main/java/org/dreamexposure/discal/client/network/google/GoogleExternalAuth.java
@@ -180,26 +180,26 @@ public class GoogleExternalAuth {
                             gs.setUseExternalCalendar(true);
 
                             return DatabaseManager.updateSettings(gs)
-                                .then(CalendarWrapper.getUsersExternalCalendars(poll.getSettings()))
+                                .then(CalendarWrapper.getUsersExternalCalendars(gs))
                                 .flatMapMany(Flux::fromIterable)
                                 .map(i -> (Consumer<EmbedCreateSpec>) spec -> {
                                     spec.setAuthor("DisCal", GlobalConst.discalSite, GlobalConst.iconUrl);
 
                                     spec.setTitle(
-                                        Messages.getMessage("Embed.AddCalendar.List.Title", poll.getSettings()));
+                                        Messages.getMessage("Embed.AddCalendar.List.Title", gs));
 
                                     spec.addField(
-                                        Messages.getMessage("Embed.AddCalendar.List.Name", poll.getSettings()),
+                                        Messages.getMessage("Embed.AddCalendar.List.Name", gs),
                                         i.getSummary(),
                                         false);
 
                                     spec.addField(
-                                        Messages.getMessage("Embed.AddCalendar.List.TimeZone", poll.getSettings()),
+                                        Messages.getMessage("Embed.AddCalendar.List.TimeZone", gs),
                                         i.getTimeZone(),
                                         false);
 
                                     spec.addField(
-                                        Messages.getMessage("Embed.AddCalendar.List.ID", poll.getSettings()),
+                                        Messages.getMessage("Embed.AddCalendar.List.ID", gs),
                                         i.getId(),
                                         false);
 
@@ -208,7 +208,7 @@ public class GoogleExternalAuth {
                                 .flatMap(em -> Messages.sendDirectMessage(em, poll.getUser()))
                                 .switchIfEmpty(Messages.sendDirectMessage(
                                     Messages.getMessage("AddCalendar.Auth.Poll.Failure.ListCalendars",
-                                        poll.getSettings()), poll.getUser()));
+                                        gs), poll.getUser()));
                         });
                     } else {
                         //Unknown network error...
diff --git a/client/src/main/java/org/dreamexposure/discal/client/network/google/PollManager.java b/client/src/main/java/org/dreamexposure/discal/client/network/google/PollManager.java
index ca9782f7..84440f48 100644
--- a/client/src/main/java/org/dreamexposure/discal/client/network/google/PollManager.java
+++ b/client/src/main/java/org/dreamexposure/discal/client/network/google/PollManager.java
@@ -5,6 +5,8 @@ import org.dreamexposure.discal.core.object.network.google.Poll;
 import java.util.Timer;
 import java.util.TimerTask;
 
+import reactor.core.scheduler.Schedulers;
+
 /**
  * Created by Nova Fox on 11/10/17.
  * Website: www.cloudcraftgaming.com
@@ -36,7 +38,9 @@ public class PollManager {
             @Override
             public void run() {
                 poll.setRemainingSeconds(poll.getRemainingSeconds() - poll.getInterval());
-                GoogleExternalAuth.getAuth().pollForAuth(poll).subscribe();
+                GoogleExternalAuth.getAuth().pollForAuth(poll)
+                    .subscribeOn(Schedulers.immediate())
+                    .subscribe();
             }
         }, 1000 * poll.getInterval());
     }