diff --git a/gui/builtinPreferenceViews/pyfaEsiPreferences.py b/gui/builtinPreferenceViews/pyfaEsiPreferences.py
index 029003a83..ef81b7480 100644
--- a/gui/builtinPreferenceViews/pyfaEsiPreferences.py
+++ b/gui/builtinPreferenceViews/pyfaEsiPreferences.py
@@ -45,20 +45,68 @@ class PFEsiPref(PreferenceView):
                                   ['Local Server', 'Manual'], 1, wx.RA_SPECIFY_COLS)
         self.rbMode.SetItemToolTip(0, "This options starts a local webserver that the web application will call back to with information about the character login.")
         self.rbMode.SetItemToolTip(1, "This option prompts users to copy and paste information from the web application to allow for character login. Use this if having issues with the local server.")
-        # self.rbServer = wx.RadioBox(panel, -1, "Server", wx.DefaultPosition, wx.DefaultSize,
-        #                             ['Tranquility', 'Singularity'], 1, wx.RA_SPECIFY_COLS)
+
+        self.rbSsoMode = wx.RadioBox(panel, -1, "SSO Mode", wx.DefaultPosition, wx.DefaultSize,
+                                     ['pyfa.io', 'Custom application'], 1, wx.RA_SPECIFY_COLS)
+        self.rbSsoMode.SetItemToolTip(0, "This options routes SSO Logins through pyfa.io, allowing you to easily login without any configuration. When in doubt, use this option.")
+        self.rbSsoMode.SetItemToolTip(1, "This option goes through EVE SSO directly, but requires more configuration. Use this is pyfa.io is blocked for some reason, or if you do not wish to route data throguh pyfa.io.")
 
         self.rbMode.SetSelection(self.settings.get('loginMode'))
-        # self.rbServer.SetSelection(self.settings.get('server'))
+        self.rbSsoMode.SetSelection(self.settings.get('ssoMode'))
 
+        rbSizer.Add(self.rbSsoMode, 1, wx.ALL, 5)
         rbSizer.Add(self.rbMode, 1, wx.TOP | wx.RIGHT, 5)
-        # rbSizer.Add(self.rbServer, 1, wx.ALL, 5)
 
         self.rbMode.Bind(wx.EVT_RADIOBOX, self.OnModeChange)
-        # self.rbServer.Bind(wx.EVT_RADIOBOX, self.OnServerChange)
+        self.rbSsoMode.Bind(wx.EVT_RADIOBOX, self.OnSSOChange)
 
         mainSizer.Add(rbSizer, 1, wx.ALL | wx.EXPAND, 0)
 
+        detailsTitle = wx.StaticText(panel, wx.ID_ANY, "Custom Application", wx.DefaultPosition, wx.DefaultSize, 0)
+        detailsTitle.Wrap(-1)
+        detailsTitle.SetFont(wx.Font(12, 70, 90, 90, False, wx.EmptyString))
+
+        mainSizer.Add(detailsTitle, 0, wx.ALL, 5)
+        mainSizer.Add(wx.StaticLine(panel, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL), 0,
+                      wx.EXPAND, 5)
+
+        # self.stInfo = wx.StaticText(panel, wx.ID_ANY,
+        #                             u"Using custom applications details will let pyfa to access the SSO under your application, rather than the pyfa application that is automatically set up. This requires you to set up your own ESI client application and accept CCPs License Agreement. Additionally, when setting up your client, make sure the callback url is set to 'http://localhost:6461'. Please see the pyfa wiki for more information regarding this",
+        #                             wx.DefaultPosition, wx.DefaultSize, 0)
+        # self.stInfo.Wrap(dlgWidth)
+        # mainSizer.Add(self.stInfo, 0, wx.EXPAND | wx.TOP | wx.BOTTOM, 5)
+
+        fgAddrSizer = wx.FlexGridSizer(2, 2, 0, 0)
+        fgAddrSizer.AddGrowableCol(1)
+        fgAddrSizer.SetFlexibleDirection(wx.BOTH)
+        fgAddrSizer.SetNonFlexibleGrowMode(wx.FLEX_GROWMODE_SPECIFIED)
+
+        self.stSetID = wx.StaticText(panel, wx.ID_ANY, u"Client ID:", wx.DefaultPosition, wx.DefaultSize, 0)
+        self.stSetID.Wrap(-1)
+        fgAddrSizer.Add(self.stSetID, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5)
+
+        self.inputClientID = wx.TextCtrl(panel, wx.ID_ANY, self.settings.get('clientID'), wx.DefaultPosition,
+                                         wx.DefaultSize, 0)
+
+        fgAddrSizer.Add(self.inputClientID, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL | wx.EXPAND, 5)
+
+        self.stSetSecret = wx.StaticText(panel, wx.ID_ANY, u"Client Secret:", wx.DefaultPosition, wx.DefaultSize, 0)
+        self.stSetSecret.Wrap(-1)
+
+        fgAddrSizer.Add(self.stSetSecret, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5)
+
+        self.inputClientSecret = wx.TextCtrl(panel, wx.ID_ANY, self.settings.get('clientSecret'), wx.DefaultPosition,
+                                             wx.DefaultSize, 0)
+
+        fgAddrSizer.Add(self.inputClientSecret, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL | wx.EXPAND, 5)
+
+        self.inputClientID.Bind(wx.EVT_TEXT, self.OnClientDetailChange)
+        self.inputClientSecret.Bind(wx.EVT_TEXT, self.OnClientDetailChange)
+
+        mainSizer.Add(fgAddrSizer, 0, wx.EXPAND, 5)
+
+
+
         timeoutSizer = wx.BoxSizer(wx.HORIZONTAL)
 
         # self.stTimout = wx.StaticText(panel, wx.ID_ANY, "Timeout (seconds):", wx.DefaultPosition, wx.DefaultSize, 0)
@@ -112,6 +160,7 @@ class PFEsiPref(PreferenceView):
 
         # self.ToggleProxySettings(self.settings.get('loginMode'))
 
+        self.ToggleSSOMode(self.settings.get('ssoMode'))
         panel.SetSizer(mainSizer)
         panel.Layout()
 
@@ -121,14 +170,31 @@ class PFEsiPref(PreferenceView):
     def OnModeChange(self, event):
         self.settings.set('loginMode', event.GetInt())
 
-    def OnServerChange(self, event):
-        self.settings.set('server', event.GetInt())
+    def OnSSOChange(self, event):
+        self.settings.set('ssoMode', event.GetInt())
+        self.ToggleSSOMode(event.GetInt())
 
-    def OnBtnApply(self, event):
+    def ToggleSSOMode(self, mode):
+        if mode:
+            self.stSetID.Enable()
+            self.inputClientID.Enable()
+            self.stSetSecret.Enable()
+            self.inputClientSecret.Enable()
+            self.rbMode.Disable()
+        else:
+            self.stSetID.Disable()
+            self.inputClientID.Disable()
+            self.stSetSecret.Disable()
+            self.inputClientSecret.Disable()
+            self.rbMode.Enable()
+
+    def OnClientDetailChange(self, evt):
         self.settings.set('clientID', self.inputClientID.GetValue().strip())
         self.settings.set('clientSecret', self.inputClientSecret.GetValue().strip())
-        sEsi = Esi.getInstance()
-        sEsi.delAllCharacters()
+
+        # sEsi = Esi.getInstance()
+        # sEsi.delAllCharacters()
+        #
 
     def getImage(self):
         return BitmapLoader.getBitmap("eve", "gui")
diff --git a/service/settings.py b/service/settings.py
index ae5ce0e11..6852dddcb 100644
--- a/service/settings.py
+++ b/service/settings.py
@@ -363,10 +363,18 @@ class EsiSettings(object):
         return cls._instance
 
     def __init__(self):
+        # SSO Mode:
+        # 0 - pyfa.io
+        # 1 - custom application
         # LoginMode:
         # 0 - Server Start Up
         # 1 - User copy and paste data from website to pyfa
-        defaults = {"loginMode": 0, "clientID": "", "clientSecret": "", "timeout": 60}
+        defaults = {
+            "ssoMode": 0,
+            "loginMode": 0,
+            "clientID": "",
+            "clientSecret": "",
+            "timeout": 60}
 
         self.settings = SettingsProvider.getInstance().getSettings(
                 "pyfaServiceEsiSettings",