diff --git a/AO2XP.py b/AO2XP.py
index f0fe164..5c0d681 100644
--- a/AO2XP.py
+++ b/AO2XP.py
@@ -81,7 +81,7 @@ if not debugmode:
             os._exit(-3)
 
     # AO2XP update checker
-    can_update = ini.read_ini_bool("AO2XP.ini", "General", "install updates", True)
+    can_update = ini.read_ini_bool("AO2XP.ini", "General", "install updates", False) # Automatic updates are opt-in!
     force_update = "forceupdate" in sys.argv[1:]
     if can_update or force_update:
         import updater
diff --git a/options.py b/options.py
index d7143d6..0f824a1 100644
--- a/options.py
+++ b/options.py
@@ -207,7 +207,7 @@ class Settings(QtGui.QDialog):
             self.allowdownload_evidence.setChecked(ini.read_ini_bool(self.inifile, "General", "download evidence"))
             self.currtheme.setCurrentIndex(self.themes.index(ini.read_ini(self.inifile, "General", "theme", "default")))
             self.autoconnect.setCurrentIndex(ini.read_ini_int(self.inifile, "General", "auto connect", -1) + 1)
-            self.check_updates.setChecked(ini.read_ini_bool(self.inifile, "General", "install updates", True))
+            self.check_updates.setChecked(ini.read_ini_bool(self.inifile, "General", "install updates", False)) # Automatic updates are opt-in!
 
             self.device_list.setCurrentIndex(ini.read_ini_int(self.inifile, "Audio", "device", audio.getcurrdevice()))
             self.musicslider.setValue(ini.read_ini_int(self.inifile, "Audio", "Music volume", 100))
diff --git a/updater.py b/updater.py
index 2960d5c..4ec10cb 100644
--- a/updater.py
+++ b/updater.py
@@ -118,7 +118,8 @@ class updateThread(QtCore.QThread):
         global returncode
 
         try:
-            manifest = json.load(BytesIO(requests.get("http://api.github.com/repos/headshot2017/AO2XP/releases").content))
+            manifest = json.load(BytesIO(requests.get("").content))
+            #manifest = json.load(BytesIO(requests.get("http://api.github.com/repos/headshot2017/AO2XP/releases").content))
         except:
             print traceback.format_exc()
             self.showMessageBox.emit("critical", "Error", "Failed to check for updates.\nPlease check your internet connection.")