diff --git a/src/gui/sizedialogwidget.h b/src/gui/sizedialogwidget.h
index a6330f0..5be87cb 100644
--- a/src/gui/sizedialogwidget.h
+++ b/src/gui/sizedialogwidget.h
@@ -1,135 +1,148 @@
 /*************************************************************************
  *  Copyright (C) 2008, 2010 by Volker Lanz <vl@fidra.de>                *
  *  Copyright (C) 2016 by Teo Mrnjavac <teo@kde.org>                     *
  *                                                                       *
  *  This program is free software; you can redistribute it and/or        *
  *  modify it under the terms of the GNU General Public License as       *
  *  published by the Free Software Foundation; either version 3 of       *
  *  the License, or (at your option) any later version.                  *
  *                                                                       *
  *  This program is distributed in the hope that it will be useful,      *
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of       *
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
  *  GNU General Public License for more details.                         *
  *                                                                       *
  *  You should have received a copy of the GNU General Public License    *
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
 #if !defined(SIZEDIALOGWIDGET__H)
 
 #define SIZEDIALOGWIDGET__H
 
 #include "ui_sizedialogwidgetbase.h"
 
 #include <QWidget>
 
 /** Central widget for the SizeDialogBase
     @author Volker Lanz <vl@fidra.de>
 */
 class SizeDialogWidget : public QWidget, public Ui::SizeDialogWidgetBase
 {
     Q_OBJECT
 
 public:
     SizeDialogWidget(QWidget* parent) : QWidget(parent), Ui::SizeDialogWidgetBase() {
         setupUi(this);
     }
 
 public:
     PartResizerWidget& partResizerWidget() {
         Q_ASSERT(m_PartResizerWidget);
         return *m_PartResizerWidget;
     }
 
     QDoubleSpinBox& spinFreeBefore() {
         Q_ASSERT(m_SpinFreeBefore);
         return *m_SpinFreeBefore;
     }
     QDoubleSpinBox& spinFreeAfter() {
         Q_ASSERT(m_SpinFreeAfter);
         return *m_SpinFreeAfter;
     }
     QDoubleSpinBox& spinCapacity() {
         Q_ASSERT(m_SpinCapacity);
         return *m_SpinCapacity;
     }
 
     QLabel& labelMinSize() {
         Q_ASSERT(m_LabelMinSize);
         return *m_LabelMinSize;
     }
     QLabel& labelMaxSize() {
         Q_ASSERT(m_LabelMaxSize);
         return *m_LabelMaxSize;
     }
 
     QRadioButton& radioPrimary() {
         Q_ASSERT(m_RadioPrimary);
         return *m_RadioPrimary;
     }
     QRadioButton& radioExtended() {
         Q_ASSERT(m_RadioExtended);
         return *m_RadioExtended;
     }
     QRadioButton& radioLogical() {
         Q_ASSERT(m_RadioLogical);
         return *m_RadioLogical;
     }
 
     QComboBox& comboFileSystem() {
         Q_ASSERT(m_ComboFileSystem);
         return *m_ComboFileSystem;
     }
 
     QCheckBox& checkBoxEncrypt() {
         Q_ASSERT(m_CheckBoxEncrypt);
         return *m_CheckBoxEncrypt;
     }
 
+    QLineEdit& editPassphrase() {
+        Q_ASSERT(m_EditPassphrase);
+        return *m_EditPassphrase;
+    }
+    QLabel& labelPassphrase() {
+        Q_ASSERT(m_LabelPassphrase);
+        return *m_LabelPassphrase;
+    }
+
     QLabel& textLabel() {
         Q_ASSERT(m_LabelTextLabel);
         return *m_LabelTextLabel;
     }
     QLineEdit& label() {
         Q_ASSERT(m_EditLabel);
         return *m_EditLabel;
     }
     const QLineEdit& label() const {
         Q_ASSERT(m_EditLabel);
         return *m_EditLabel;
     }
     QLabel& noSetLabel() {
         Q_ASSERT(m_LabelTextNoSetLabel);
         return *m_LabelTextNoSetLabel;
     }
 
     void hideRole() {
         delete m_LabelRole;
         m_LabelRole = nullptr;
         delete m_RadioPrimary;
         m_RadioPrimary = nullptr;
         delete m_RadioExtended;
         m_RadioExtended = nullptr;
         delete m_RadioLogical;
         m_RadioLogical = nullptr;
     }
     void hideFileSystem() {
         delete m_LabelFileSystem;
         m_LabelFileSystem = nullptr;
         delete m_ComboFileSystem;
         m_ComboFileSystem = nullptr;
         delete m_CheckBoxEncrypt;
         m_CheckBoxEncrypt = nullptr;
+        delete m_LabelPassphrase;
+        m_LabelPassphrase = nullptr;
+        delete m_EditPassphrase;
+        m_EditPassphrase = nullptr;
     }
     void hideLabel() {
         delete m_LabelTextLabel;
         m_LabelTextLabel = nullptr;
         delete m_EditLabel;
         m_EditLabel = nullptr;
         delete m_LabelTextNoSetLabel;
         m_LabelTextNoSetLabel = nullptr;
     }
 };
 
 #endif
diff --git a/src/gui/sizedialogwidgetbase.ui b/src/gui/sizedialogwidgetbase.ui
index 8fc4f09..710121b 100644
--- a/src/gui/sizedialogwidgetbase.ui
+++ b/src/gui/sizedialogwidgetbase.ui
@@ -1,337 +1,358 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>SizeDialogWidgetBase</class>
  <widget class="QWidget" name="SizeDialogWidgetBase">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>653</width>
-    <height>655</height>
+    <height>693</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <item row="10" column="1">
+    <widget class="FormattedSpinBox" name="m_SpinCapacity">
+     <property name="minimum">
+      <double>0.000000000000000</double>
+     </property>
+     <property name="maximum">
+      <double>999999999.000000000000000</double>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0">
+    <widget class="QLabel" name="m_LabelPassphrase">
+     <property name="text">
+      <string>Passphrase:</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+     </property>
+    </widget>
+   </item>
    <item row="1" column="0" colspan="2">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Fixed</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>470</width>
        <height>17</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="0" column="0" colspan="2">
     <widget class="PartResizerWidget" name="m_PartResizerWidget" native="true">
      <property name="minimumSize">
       <size>
        <width>400</width>
        <height>60</height>
       </size>
      </property>
      <property name="maximumSize">
       <size>
        <width>16777215</width>
        <height>60</height>
       </size>
      </property>
     </widget>
    </item>
    <item row="2" column="0">
     <widget class="QLabel" name="m_LabelRole">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text">
       <string comment="@label:listbox">Partition &amp;type:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>m_RadioPrimary</cstring>
      </property>
     </widget>
    </item>
    <item row="2" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QRadioButton" name="m_RadioPrimary">
        <property name="text">
         <string>Primar&amp;y</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QRadioButton" name="m_RadioExtended">
        <property name="text">
         <string>E&amp;xtended</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QRadioButton" name="m_RadioLogical">
        <property name="text">
         <string>&amp;Logical</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item row="3" column="0">
     <widget class="QLabel" name="m_LabelFileSystem">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text">
       <string comment="@label:listbox">File system:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>m_ComboFileSystem</cstring>
      </property>
     </widget>
    </item>
-   <item row="5" column="0">
+   <item row="6" column="0">
     <widget class="QLabel" name="m_LabelTextLabel">
      <property name="text">
       <string comment="@label">Label:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>m_EditLabel</cstring>
      </property>
     </widget>
    </item>
-   <item row="5" column="1">
+   <item row="6" column="1">
     <layout class="QVBoxLayout" name="verticalLayout">
      <item>
       <widget class="QLineEdit" name="m_EditLabel"/>
      </item>
      <item>
       <widget class="QLabel" name="m_LabelTextNoSetLabel">
        <property name="text">
         <string comment="@label">This file system does not support setting a label.</string>
        </property>
        <property name="wordWrap">
         <bool>true</bool>
        </property>
       </widget>
      </item>
     </layout>
    </item>
-   <item row="6" column="0">
+   <item row="7" column="0">
     <widget class="QLabel" name="label_4">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text">
       <string comment="@label">Minimum size:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
     </widget>
    </item>
-   <item row="6" column="1">
+   <item row="7" column="1">
     <widget class="QLabel" name="m_LabelMinSize">
      <property name="textInteractionFlags">
       <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
      </property>
     </widget>
    </item>
-   <item row="7" column="0">
+   <item row="8" column="0">
     <widget class="QLabel" name="label_5">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text">
       <string comment="@label">Maximum size:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
     </widget>
    </item>
-   <item row="7" column="1">
+   <item row="8" column="1">
     <widget class="QLabel" name="m_LabelMaxSize">
      <property name="textInteractionFlags">
       <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
      </property>
     </widget>
    </item>
-   <item row="8" column="0">
+   <item row="9" column="0">
     <widget class="QLabel" name="label">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
        <horstretch>3</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text">
-      <string comment="@label:listbox">Free space before:</string>
+      <string comment="@label:listbox">F&amp;ree space before:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>m_SpinFreeBefore</cstring>
      </property>
     </widget>
    </item>
-   <item row="8" column="1">
+   <item row="9" column="1">
     <widget class="FormattedSpinBox" name="m_SpinFreeBefore">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
        <horstretch>4</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="minimum">
       <double>0.000000000000000</double>
      </property>
      <property name="maximum">
       <double>999999999.000000000000000</double>
      </property>
     </widget>
    </item>
-   <item row="9" column="0">
+   <item row="10" column="0">
     <widget class="QLabel" name="label_2">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text">
       <string comment="@label:listbox">Si&amp;ze:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>m_SpinCapacity</cstring>
      </property>
     </widget>
    </item>
-   <item row="9" column="1">
-    <widget class="FormattedSpinBox" name="m_SpinCapacity">
-     <property name="minimum">
-      <double>0.000000000000000</double>
-     </property>
-     <property name="maximum">
-      <double>999999999.000000000000000</double>
-     </property>
-    </widget>
-   </item>
-   <item row="10" column="0">
+   <item row="11" column="0">
     <widget class="QLabel" name="label_3">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text">
       <string comment="@label:listbox">Free space after:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>m_SpinFreeAfter</cstring>
      </property>
     </widget>
    </item>
-   <item row="10" column="1">
+   <item row="11" column="1">
     <widget class="FormattedSpinBox" name="m_SpinFreeAfter">
      <property name="minimum">
       <double>0.000000000000000</double>
      </property>
      <property name="maximum">
       <double>999999999.000000000000000</double>
      </property>
     </widget>
    </item>
-   <item row="11" column="0" colspan="2">
+   <item row="12" column="0" colspan="2">
     <spacer name="verticalSpacer_2">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Fixed</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>470</width>
        <height>7</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="3" column="1">
     <layout class="QVBoxLayout" name="verticalLayout_2">
      <item>
       <widget class="QComboBox" name="m_ComboFileSystem"/>
      </item>
+    </layout>
+   </item>
+   <item row="4" column="1">
+    <widget class="QCheckBox" name="m_CheckBoxEncrypt">
+     <property name="toolTip">
+      <string>Set up encryption for this filesystem with LUKS. You will be asked to provide a passphrase.</string>
+     </property>
+     <property name="text">
+      <string>Encrypt with LUKS</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="1">
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
-      <widget class="QCheckBox" name="m_CheckBoxEncrypt">
-       <property name="toolTip">
-        <string>Set up encryption for this filesystem with LUKS. You will be asked to provide a passphrase.</string>
-       </property>
-       <property name="text">
-        <string>Encrypt with LUKS</string>
+      <widget class="QLineEdit" name="m_EditPassphrase">
+       <property name="echoMode">
+        <enum>QLineEdit::Password</enum>
        </property>
       </widget>
      </item>
     </layout>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>PartResizerWidget</class>
    <extends>QWidget</extends>
    <header>kpmcore/gui/partresizerwidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>FormattedSpinBox</class>
    <extends>QDoubleSpinBox</extends>
    <header>gui/formattedspinbox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>m_RadioPrimary</tabstop>
   <tabstop>m_RadioExtended</tabstop>
   <tabstop>m_RadioLogical</tabstop>
   <tabstop>m_EditLabel</tabstop>
   <tabstop>m_SpinFreeBefore</tabstop>
   <tabstop>m_SpinCapacity</tabstop>
   <tabstop>m_SpinFreeAfter</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>