diff --git a/client/src/main/java/ctbrec/ui/sites/amateurtv/AmateurTvSiteUi.java b/client/src/main/java/ctbrec/ui/sites/amateurtv/AmateurTvSiteUi.java
index 14af5419..2196e50d 100644
--- a/client/src/main/java/ctbrec/ui/sites/amateurtv/AmateurTvSiteUi.java
+++ b/client/src/main/java/ctbrec/ui/sites/amateurtv/AmateurTvSiteUi.java
@@ -16,23 +16,27 @@ public class AmateurTvSiteUi extends AbstractSiteUi {
 
     private static final Logger LOG = LoggerFactory.getLogger(AmateurTvSiteUi.class);
 
-    private final AmateurTvTabProvider tabProvider;
     private final AmateurTv site;
-    private final AmateurTvConfigUI configUi;
+    private AmateurTvTabProvider tabProvider;
+    private AmateurTvConfigUI configUi;
 
     public AmateurTvSiteUi(AmateurTv amateurTv) {
         this.site = amateurTv;
-        tabProvider = new AmateurTvTabProvider(amateurTv);
-        configUi = new AmateurTvConfigUI(amateurTv);
     }
 
     @Override
     public TabProvider getTabProvider() {
+        if (tabProvider == null) {
+            tabProvider = new AmateurTvTabProvider(site);
+        }
         return tabProvider;
     }
 
     @Override
     public ConfigUI getConfigUI() {
+        if (configUi == null) {
+            configUi = new AmateurTvConfigUI(site);
+        }
         return configUi;
     }
 
diff --git a/client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsSiteUi.java b/client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsSiteUi.java
index 4d8e50a2..ac9ef402 100644
--- a/client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsSiteUi.java
+++ b/client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsSiteUi.java
@@ -15,23 +15,27 @@ import ctbrec.ui.tabs.TabProvider;
 public class BongaCamsSiteUi extends AbstractSiteUi {
 
     private static final Logger LOG = LoggerFactory.getLogger(BongaCamsSiteUi.class);
-    private final BongaCamsTabProvider tabProvider;
-    private final BongaCamsConfigUI configUi;
     private final BongaCams bongaCams;
+    private BongaCamsTabProvider tabProvider;
+    private BongaCamsConfigUI configUi;
 
     public BongaCamsSiteUi(BongaCams bongaCams) {
         this.bongaCams = bongaCams;
-        tabProvider = new BongaCamsTabProvider(bongaCams);
-        configUi = new BongaCamsConfigUI(bongaCams);
     }
 
     @Override
     public TabProvider getTabProvider() {
+        if (tabProvider == null) {
+            tabProvider = new BongaCamsTabProvider(bongaCams);
+        }
         return tabProvider;
     }
 
     @Override
     public ConfigUI getConfigUI() {
+        if (configUi == null) {
+            configUi = new BongaCamsConfigUI(bongaCams);
+        }
         return configUi;
     }
 
diff --git a/client/src/main/java/ctbrec/ui/sites/cam4/Cam4SiteUi.java b/client/src/main/java/ctbrec/ui/sites/cam4/Cam4SiteUi.java
index 3d972ba2..24224b60 100644
--- a/client/src/main/java/ctbrec/ui/sites/cam4/Cam4SiteUi.java
+++ b/client/src/main/java/ctbrec/ui/sites/cam4/Cam4SiteUi.java
@@ -15,24 +15,28 @@ import ctbrec.ui.tabs.TabProvider;
 public class Cam4SiteUi extends AbstractSiteUi {
     private static final Logger LOG = LoggerFactory.getLogger(Cam4SiteUi.class);
 
+    private final Cam4 cam4;
     private Cam4TabProvider tabProvider;
-    private Cam4ConfigUI configUI;
-    private Cam4 cam4;
+    private Cam4ConfigUI configUi;
 
     public Cam4SiteUi(Cam4 cam4) {
         this.cam4 = cam4;
-        tabProvider = new Cam4TabProvider(cam4);
-        configUI = new Cam4ConfigUI(cam4);
     }
 
     @Override
     public TabProvider getTabProvider() {
+        if (tabProvider == null) {
+            tabProvider = new Cam4TabProvider(cam4);
+        }
         return tabProvider;
     }
 
     @Override
     public ConfigUI getConfigUI() {
-        return configUI;
+        if (configUi == null) {
+            configUi = new Cam4ConfigUI(cam4);
+        }
+        return configUi;
     }
 
     @Override
diff --git a/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaSiteUi.java b/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaSiteUi.java
index f065f7d5..c8733424 100644
--- a/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaSiteUi.java
+++ b/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaSiteUi.java
@@ -9,9 +9,9 @@ import ctbrec.ui.tabs.TabProvider;
 
 public class CamsodaSiteUi extends AbstractSiteUi {
 
+    private final Camsoda camsoda;
     private CamsodaTabProvider tabProvider;
     private CamsodaConfigUI configUi;
-    private Camsoda camsoda;
 
     public CamsodaSiteUi(Camsoda camsoda) {
         this.camsoda = camsoda;
diff --git a/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateSiteUi.java b/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateSiteUi.java
index 73a5e616..2437e8fd 100644
--- a/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateSiteUi.java
+++ b/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateSiteUi.java
@@ -9,23 +9,27 @@ import ctbrec.ui.tabs.TabProvider;
 
 public class ChaturbateSiteUi extends AbstractSiteUi {
 
+    private final Chaturbate chaturbate;
     private ChaturbateTabProvider tabProvider;
     private ChaturbateConfigUi configUi;
-    private Chaturbate chaturbate;
 
     public ChaturbateSiteUi(Chaturbate chaturbate) {
         this.chaturbate = chaturbate;
-        tabProvider = new ChaturbateTabProvider(chaturbate);
-        configUi = new ChaturbateConfigUi(chaturbate);
     }
 
     @Override
     public TabProvider getTabProvider() {
+        if (tabProvider == null) {
+            tabProvider = new ChaturbateTabProvider(chaturbate);
+        }
         return tabProvider;
     }
 
     @Override
     public ConfigUI getConfigUI() {
+        if (configUi == null) {
+            configUi = new ChaturbateConfigUi(chaturbate);
+        }
         return configUi;
     }
 
diff --git a/client/src/main/java/ctbrec/ui/sites/fc2live/Fc2LiveSiteUi.java b/client/src/main/java/ctbrec/ui/sites/fc2live/Fc2LiveSiteUi.java
index 2b722627..e9efaa37 100644
--- a/client/src/main/java/ctbrec/ui/sites/fc2live/Fc2LiveSiteUi.java
+++ b/client/src/main/java/ctbrec/ui/sites/fc2live/Fc2LiveSiteUi.java
@@ -18,23 +18,27 @@ import ctbrec.ui.tabs.TabProvider;
 
 public class Fc2LiveSiteUi extends AbstractSiteUi {
     private static final Logger LOG = LoggerFactory.getLogger(Fc2LiveSiteUi.class);
-    private Fc2Live fc2live;
+    private final Fc2Live fc2live;
     private Fc2TabProvider tabProvider;
     private Fc2LiveConfigUI configUi;
 
     public Fc2LiveSiteUi(Fc2Live fc2live) {
         this.fc2live = fc2live;
-        this.tabProvider = new Fc2TabProvider(fc2live);
-        this.configUi = new Fc2LiveConfigUI(fc2live);
     }
 
     @Override
     public TabProvider getTabProvider() {
+        if (tabProvider == null) {
+            this.tabProvider = new Fc2TabProvider(fc2live);
+        }
         return tabProvider;
     }
 
     @Override
     public ConfigUI getConfigUI() {
+        if (configUi == null) {
+            this.configUi = new Fc2LiveConfigUI(fc2live);
+        }
         return configUi;
     }
 
diff --git a/client/src/main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeSiteUi.java b/client/src/main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeSiteUi.java
index 024ec4bf..5d184dd7 100644
--- a/client/src/main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeSiteUi.java
+++ b/client/src/main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeSiteUi.java
@@ -9,23 +9,27 @@ import ctbrec.ui.tabs.TabProvider;
 
 public class Flirt4FreeSiteUi extends AbstractSiteUi {
 
-    private Flirt4Free flirt4Free;
+    private final Flirt4Free flirt4Free;
     private Flirt4FreeTabProvider tabProvider;
     private Flirt4FreeConfigUI configUi;
 
     public Flirt4FreeSiteUi(Flirt4Free flirt4Free) {
         this.flirt4Free = flirt4Free;
-        tabProvider = new Flirt4FreeTabProvider(flirt4Free);
-        configUi = new Flirt4FreeConfigUI(flirt4Free);
     }
 
     @Override
     public TabProvider getTabProvider() {
+        if (tabProvider == null) {
+            tabProvider = new Flirt4FreeTabProvider(flirt4Free);
+        }
         return tabProvider;
     }
 
     @Override
     public ConfigUI getConfigUI() {
+        if (configUi == null) {
+            configUi = new Flirt4FreeConfigUI(flirt4Free);
+        }
         return configUi;
     }
 
diff --git a/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminSiteUi.java b/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminSiteUi.java
index 11cbaabf..d40f7c2d 100644
--- a/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminSiteUi.java
+++ b/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminSiteUi.java
@@ -16,24 +16,28 @@ import ctbrec.ui.tabs.TabProvider;
 public class LiveJasminSiteUi extends AbstractSiteUi {
 
     private static final Logger LOG = LoggerFactory.getLogger(LiveJasminSiteUi.class);
-    private LiveJasmin liveJasmin;
+    private final LiveJasmin liveJasmin;
     private LiveJasminTabProvider tabProvider;
     private LiveJasminConfigUi configUi;
     private long lastLoginTime = 0;
 
     public LiveJasminSiteUi(LiveJasmin liveJasmin) {
         this.liveJasmin = liveJasmin;
-        tabProvider = new LiveJasminTabProvider(liveJasmin);
-        configUi = new LiveJasminConfigUi(liveJasmin);
     }
 
     @Override
     public TabProvider getTabProvider() {
+        if (tabProvider == null) {
+            tabProvider = new LiveJasminTabProvider(liveJasmin);
+        }
         return tabProvider;
     }
 
     @Override
     public ConfigUI getConfigUI() {
+        if (configUi == null) {
+            configUi = new LiveJasminConfigUi(liveJasmin);
+        }
         return configUi;
     }
 
diff --git a/client/src/main/java/ctbrec/ui/sites/manyvids/MVLiveSiteUi.java b/client/src/main/java/ctbrec/ui/sites/manyvids/MVLiveSiteUi.java
index fbb96019..eae2d72d 100644
--- a/client/src/main/java/ctbrec/ui/sites/manyvids/MVLiveSiteUi.java
+++ b/client/src/main/java/ctbrec/ui/sites/manyvids/MVLiveSiteUi.java
@@ -9,21 +9,27 @@ import ctbrec.ui.tabs.TabProvider;
 
 public class MVLiveSiteUi extends AbstractSiteUi {
 
+    private final MVLive mvlive;
     private MVLiveTabProvider tabProvider;
     private MVLiveConfigUi configUi;
 
     public MVLiveSiteUi(MVLive mvlive) {
-        tabProvider = new MVLiveTabProvider(mvlive);
-        configUi = new MVLiveConfigUi(mvlive);
+        this.mvlive = mvlive;
     }
 
     @Override
     public TabProvider getTabProvider() {
+        if (tabProvider == null) {
+            tabProvider = new MVLiveTabProvider(mvlive);
+        }
         return tabProvider;
     }
 
     @Override
     public ConfigUI getConfigUI() {
+        if (configUi == null) {
+            configUi = new MVLiveConfigUi(mvlive);
+        }
         return configUi;
     }
 
diff --git a/client/src/main/java/ctbrec/ui/sites/myfreecams/MyFreeCamsSiteUi.java b/client/src/main/java/ctbrec/ui/sites/myfreecams/MyFreeCamsSiteUi.java
index 785f8308..4241f35b 100644
--- a/client/src/main/java/ctbrec/ui/sites/myfreecams/MyFreeCamsSiteUi.java
+++ b/client/src/main/java/ctbrec/ui/sites/myfreecams/MyFreeCamsSiteUi.java
@@ -15,17 +15,21 @@ public class MyFreeCamsSiteUi extends AbstractSiteUi {
 
     public MyFreeCamsSiteUi(MyFreeCams myFreeCams) {
         this.myFreeCams = myFreeCams;
-        tabProvider = new MyFreeCamsTabProvider(myFreeCams);
-        configUi = new MyFreeCamsConfigUI(myFreeCams);
     }
 
     @Override
     public TabProvider getTabProvider() {
+        if (tabProvider == null) {
+            tabProvider = new MyFreeCamsTabProvider(myFreeCams);
+        }
         return tabProvider;
     }
 
     @Override
     public ConfigUI getConfigUI() {
+        if (configUi == null) {
+            configUi = new MyFreeCamsConfigUI(myFreeCams);
+        }
         return configUi;
     }
 
diff --git a/client/src/main/java/ctbrec/ui/sites/showup/ShowupSiteUi.java b/client/src/main/java/ctbrec/ui/sites/showup/ShowupSiteUi.java
index 97cc1eb1..6a75bf9a 100644
--- a/client/src/main/java/ctbrec/ui/sites/showup/ShowupSiteUi.java
+++ b/client/src/main/java/ctbrec/ui/sites/showup/ShowupSiteUi.java
@@ -16,23 +16,27 @@ public class ShowupSiteUi extends AbstractSiteUi {
 
     private static final Logger LOG = LoggerFactory.getLogger(ShowupSiteUi.class);
 
-    private Showup site;
+    private final Showup site;
     private ConfigUI configUi;
     private TabProvider tabProvider;
 
     public ShowupSiteUi(Showup site) {
         this.site = site;
-        configUi = new ShowupConfigUI(site);
-        tabProvider = new ShowupTabProvider(site);
     }
 
     @Override
     public TabProvider getTabProvider() {
+        if (tabProvider == null) {
+            tabProvider = new ShowupTabProvider(site);
+        }
         return tabProvider;
     }
 
     @Override
     public ConfigUI getConfigUI() {
+        if (configUi == null) {
+            configUi = new ShowupConfigUI(site);
+        }
         return configUi;
     }
 
diff --git a/client/src/main/java/ctbrec/ui/sites/streamate/StreamateSiteUi.java b/client/src/main/java/ctbrec/ui/sites/streamate/StreamateSiteUi.java
index 6fdd754f..5612f6fc 100644
--- a/client/src/main/java/ctbrec/ui/sites/streamate/StreamateSiteUi.java
+++ b/client/src/main/java/ctbrec/ui/sites/streamate/StreamateSiteUi.java
@@ -15,17 +15,21 @@ public class StreamateSiteUi extends AbstractSiteUi {
 
     public StreamateSiteUi(Streamate streamate) {
         this.streamate = streamate;
-        tabProvider = new StreamateTabProvider(streamate);
-        configUi = new StreamateConfigUI(streamate);
     }
 
     @Override
     public TabProvider getTabProvider() {
+        if (tabProvider == null) {
+            tabProvider = new StreamateTabProvider(streamate);
+        }
         return tabProvider;
     }
 
     @Override
     public ConfigUI getConfigUI() {
+        if (configUi == null) {
+            configUi = new StreamateConfigUI(streamate);
+        }
         return configUi;
     }
 
diff --git a/client/src/main/java/ctbrec/ui/sites/stripchat/StripchatSiteUi.java b/client/src/main/java/ctbrec/ui/sites/stripchat/StripchatSiteUi.java
index 9ecdb584..3621d921 100644
--- a/client/src/main/java/ctbrec/ui/sites/stripchat/StripchatSiteUi.java
+++ b/client/src/main/java/ctbrec/ui/sites/stripchat/StripchatSiteUi.java
@@ -22,17 +22,21 @@ public class StripchatSiteUi extends AbstractSiteUi {
 
     public StripchatSiteUi(Stripchat stripchat) {
         this.site = stripchat;
-        tabProvider = new StripchatTabProvider(stripchat);
-        configUi = new StripchatConfigUI(stripchat);
     }
 
     @Override
     public TabProvider getTabProvider() {
+        if (tabProvider == null) {
+            tabProvider = new StripchatTabProvider(site);
+        }
         return tabProvider;
     }
 
     @Override
     public ConfigUI getConfigUI() {
+        if (configUi == null) {
+            configUi = new StripchatConfigUI(site);
+        }
         return configUi;
     }
 
diff --git a/client/src/main/java/ctbrec/ui/sites/xlovecam/XloveCamSiteUi.java b/client/src/main/java/ctbrec/ui/sites/xlovecam/XloveCamSiteUi.java
index d3453352..06ef3306 100644
--- a/client/src/main/java/ctbrec/ui/sites/xlovecam/XloveCamSiteUi.java
+++ b/client/src/main/java/ctbrec/ui/sites/xlovecam/XloveCamSiteUi.java
@@ -9,23 +9,27 @@ import ctbrec.ui.tabs.TabProvider;
 
 public class XloveCamSiteUi extends AbstractSiteUi {
 
-    private final XloveCamTabProvider tabProvider;
     private final XloveCam site;
-    private final XloveCamConfigUI configUi;
+    private XloveCamTabProvider tabProvider;
+    private XloveCamConfigUI configUi;
 
     public XloveCamSiteUi(XloveCam xloveCam) {
         this.site = xloveCam;
-        tabProvider = new XloveCamTabProvider(xloveCam);
-        configUi = new XloveCamConfigUI(xloveCam);
     }
 
     @Override
     public TabProvider getTabProvider() {
+        if (tabProvider == null) {
+            tabProvider = new XloveCamTabProvider(site);
+        }
         return tabProvider;
     }
 
     @Override
     public ConfigUI getConfigUI() {
+        if (configUi == null) {
+            configUi = new XloveCamConfigUI(site);
+        }
         return configUi;
     }