diff --git a/wizarddialog.cpp b/wizarddialog.cpp
index 3283c646a2b59952799126f882964a99bc2960c1..a004337124389de12b25bb82c3ea93194c2922ae 100644
--- a/wizarddialog.cpp
+++ b/wizarddialog.cpp
@@ -80,19 +80,6 @@ WizardDialog::WizardDialog(WizardMode wizardMode, Account* toBeMigrated, QWidget
     connect(&nameLookupTimer_, QTimer::timeout, this, WizardDialog::timeoutNameLookupTimer);
     connect(ui->photoBooth, &PhotoboothWidget::photoTaken, this, WizardDialog::on_photoTaken);
     ui->avatarLabel->hide();
-    ui->disablePassword->setChecked(false);
-
-    connect(ui->disablePassword, QCheckBox::stateChanged, [=](int state){
-        if (state == Qt::Checked){
-            ui->passwordEdit->setEnabled(false);
-            ui->passwordEdit->clear();
-            ui->confirmPasswordEdit->setEnabled(false);
-            ui->confirmPasswordEdit->clear();
-        } else if (Qt::Unchecked || Qt::PartiallyChecked) {
-            ui->passwordEdit->setEnabled(true);
-            ui->confirmPasswordEdit->setEnabled(true);
-        }
-    });
 }
 
 WizardDialog::~WizardDialog()
diff --git a/wizarddialog.ui b/wizarddialog.ui
index 5dd72b3502bde4c21f4b2902c78216839837d9da..de7d0d475d8598743275cf9f1fc8b11cea8c63de 100644
--- a/wizarddialog.ui
+++ b/wizarddialog.ui
@@ -685,6 +685,9 @@ p, li { white-space: pre-wrap; }
        </item>
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_2">
+         <property name="spacing">
+          <number>0</number>
+         </property>
          <item>
           <spacer name="horizontalSpacer_2">
            <property name="orientation">
@@ -745,26 +748,13 @@ p, li { white-space: pre-wrap; }
            <property name="text">
             <string>Searching...</string>
            </property>
+           <property name="margin">
+            <number>6</number>
+           </property>
           </widget>
          </item>
         </layout>
        </item>
-       <item alignment="Qt::AlignHCenter">
-        <widget class="QCheckBox" name="disablePassword">
-         <property name="toolTip">
-          <string>Disable password checkbox</string>
-         </property>
-         <property name="accessibleName">
-          <string/>
-         </property>
-         <property name="accessibleDescription">
-          <string/>
-         </property>
-         <property name="text">
-          <string> I do not want to set a password</string>
-         </property>
-        </widget>
-       </item>
        <item alignment="Qt::AlignHCenter">
         <widget class="QLineEdit" name="pinEdit">
          <property name="minimumSize">
@@ -1039,17 +1029,17 @@ p, li { white-space: pre-wrap; }
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>RingButton</class>
+   <extends>QPushButton</extends>
+   <header>ringbutton.h</header>
+  </customwidget>
   <customwidget>
    <class>PhotoboothWidget</class>
    <extends>QWidget</extends>
    <header>photoboothwidget.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>RingButton</class>
-   <extends>QPushButton</extends>
-   <header>ringbutton.h</header>
-  </customwidget>
  </customwidgets>
  <resources>
   <include location="ressources.qrc"/>