diff --git a/launcher/ui/setupwizard/JavaWizardPage.cpp b/launcher/ui/setupwizard/JavaWizardPage.cpp
index abe4860da..d537580fc 100644
--- a/launcher/ui/setupwizard/JavaWizardPage.cpp
+++ b/launcher/ui/setupwizard/JavaWizardPage.cpp
@@ -57,6 +57,8 @@ bool JavaWizardPage::validatePage()
 {
     auto settings = APPLICATION->settings();
     auto result = m_java_widget->validate();
+    settings->set("AutomaticJavaSwitch", m_java_widget->autodetectJava());
+    settings->set("AutomaticJavaDownload", m_java_widget->autodownloadJava());
     switch (result) {
         default:
         case JavaSettingsWidget::ValidationStatus::Bad: {
diff --git a/launcher/ui/widgets/JavaSettingsWidget.cpp b/launcher/ui/widgets/JavaSettingsWidget.cpp
index 507c632d5..c15f7bf42 100644
--- a/launcher/ui/widgets/JavaSettingsWidget.cpp
+++ b/launcher/ui/widgets/JavaSettingsWidget.cpp
@@ -136,6 +136,26 @@ void JavaSettingsWidget::setupUi()
 
     m_verticalLayout->addLayout(m_horizontalBtnLayout);
 
+    m_autoJavaGroupBox = new QGroupBox(this);
+    m_autoJavaGroupBox->setObjectName(QStringLiteral("autoJavaGroupBox"));
+    m_veriticalJavaLayout = new QVBoxLayout(m_autoJavaGroupBox);
+    m_veriticalJavaLayout->setObjectName(QStringLiteral("veriticalJavaLayout"));
+
+    m_autodetectJavaCheckBox = new QCheckBox(m_autoJavaGroupBox);
+    m_autodetectJavaCheckBox->setObjectName("autodetectJavaCheckBox");
+    m_veriticalJavaLayout->addWidget(m_autodetectJavaCheckBox);
+
+    m_autodownloadCheckBox = new QCheckBox(m_autoJavaGroupBox);
+    m_autodownloadCheckBox->setObjectName("autodownloadCheckBox");
+    m_autodownloadCheckBox->setEnabled(false);
+    m_veriticalJavaLayout->addWidget(m_autodownloadCheckBox);
+    connect(m_autodetectJavaCheckBox, &QCheckBox::stateChanged, this, [this] {
+        m_autodownloadCheckBox->setEnabled(m_autodetectJavaCheckBox->isChecked());
+        if (!m_autodetectJavaCheckBox->isChecked())
+            m_autodownloadCheckBox->setChecked(false);
+    });
+    m_verticalLayout->addWidget(m_autoJavaGroupBox);
+
     retranslate();
 }
 
@@ -153,6 +173,9 @@ void JavaSettingsWidget::initialize()
     m_maxMemSpinBox->setValue(observedMaxMemory);
     m_permGenSpinBox->setValue(observedPermGenMemory);
     updateThresholds();
+
+    m_autodetectJavaCheckBox->setChecked(s->get("AutomaticJavaSwitch").toBool());
+    m_autodownloadCheckBox->setChecked(s->get("AutomaticJavaSwitch").toBool() && s->get("AutomaticJavaDownload").toBool());
 }
 
 void JavaSettingsWidget::refresh()
@@ -280,11 +303,13 @@ void JavaSettingsWidget::on_javaBrowseBtn_clicked()
     m_javaPathTextBox->setText(cooked_path);
     checkJavaPath(cooked_path);
 }
+
 void JavaSettingsWidget::on_javaDownloadBtn_clicked()
 {
     auto jdialog = new Java::Downloader(this);
     jdialog->exec();
 }
+
 void JavaSettingsWidget::on_javaStatusBtn_clicked()
 {
     QString text;
@@ -418,6 +443,9 @@ void JavaSettingsWidget::retranslate()
     m_minMemSpinBox->setToolTip(tr("The amount of memory Minecraft is started with."));
     m_permGenSpinBox->setToolTip(tr("The amount of memory available to store loaded Java classes."));
     m_javaBrowseBtn->setText(tr("Browse"));
+    m_autodownloadCheckBox->setText(tr("Autodownload Mojang Java"));
+    m_autodetectJavaCheckBox->setText(tr("Autodetect Java version"));
+    m_autoJavaGroupBox->setTitle(tr("Autodetect Java"));
 }
 
 void JavaSettingsWidget::updateThresholds()
@@ -464,3 +492,13 @@ void JavaSettingsWidget::on_addJavaPathBtn_clicked()
     APPLICATION->settings()->set("JavaExtraSearchPaths", currentList);
     refresh();
 }
+
+bool JavaSettingsWidget::autodownloadJava() const
+{
+    return m_autodetectJavaCheckBox->isChecked();
+}
+
+bool JavaSettingsWidget::autodetectJava() const
+{
+    return m_autodownloadCheckBox->isChecked();
+}
diff --git a/launcher/ui/widgets/JavaSettingsWidget.h b/launcher/ui/widgets/JavaSettingsWidget.h
index 385a9256a..205b83d8c 100644
--- a/launcher/ui/widgets/JavaSettingsWidget.h
+++ b/launcher/ui/widgets/JavaSettingsWidget.h
@@ -4,6 +4,7 @@
 #include <BaseVersion.h>
 #include <QObjectPtr.h>
 #include <java/JavaChecker.h>
+#include <qcheckbox.h>
 #include <QIcon>
 
 class QLineEdit;
@@ -41,6 +42,8 @@ class JavaSettingsWidget : public QWidget {
     int minHeapSize() const;
     int maxHeapSize() const;
     QString javaPath() const;
+    bool autodetectJava() const;
+    bool autodownloadJava() const;
 
     void updateThresholds();
 
@@ -86,6 +89,11 @@ class JavaSettingsWidget : public QWidget {
     QIcon yellowIcon;
     QIcon badIcon;
 
+    QGroupBox* m_autoJavaGroupBox = nullptr;
+    QVBoxLayout* m_veriticalJavaLayout = nullptr;
+    QCheckBox* m_autodetectJavaCheckBox = nullptr;
+    QCheckBox* m_autodownloadCheckBox = nullptr;
+
     unsigned int observedMinMemory = 0;
     unsigned int observedMaxMemory = 0;
     unsigned int observedPermGenMemory = 0;