diff --git a/vpn/l2tp/l2tpadvanced.ui b/vpn/l2tp/l2tpadvanced.ui
index 9311f9d0..4d405dcb 100644
--- a/vpn/l2tp/l2tpadvanced.ui
+++ b/vpn/l2tp/l2tpadvanced.ui
@@ -1,293 +1,303 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>L2tpAdvancedWidget</class>
  <widget class="QWidget" name="L2tpAdvancedWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>382</width>
     <height>254</height>
    </rect>
   </property>
   <layout class="QFormLayout" name="formLayout">
    <property name="verticalSpacing">
     <number>6</number>
    </property>
    <item row="0" column="0" colspan="2">
     <widget class="QCheckBox" name="cbEnableTunnelToHost">
      <property name="text">
       <string>Enable IPsec tunnel to L2TP host</string>
      </property>
     </widget>
    </item>
    <item row="1" column="0">
     <widget class="QLabel" name="label">
      <property name="enabled">
       <bool>false</bool>
      </property>
      <property name="text">
       <string>Gateway ID:</string>
      </property>
     </widget>
    </item>
    <item row="1" column="1">
     <widget class="QLineEdit" name="gatewayId">
      <property name="enabled">
       <bool>false</bool>
      </property>
     </widget>
    </item>
    <item row="2" column="0">
     <widget class="QLabel" name="label_2">
      <property name="enabled">
       <bool>false</bool>
      </property>
      <property name="text">
       <string>Pre-shared Key:</string>
      </property>
     </widget>
    </item>
    <item row="2" column="1">
-    <widget class="QLineEdit" name="presharedKey">
+    <widget class="PasswordField" name="presharedKey">
      <property name="enabled">
       <bool>false</bool>
      </property>
+     <property name="passwordModeEnabled" stdset="0">
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
    <item row="3" column="0">
     <widget class="QLabel" name="label_3">
      <property name="enabled">
       <bool>false</bool>
      </property>
      <property name="text">
       <string>Phase1 algorithms:</string>
      </property>
     </widget>
    </item>
    <item row="3" column="1">
     <widget class="QLineEdit" name="ike">
      <property name="enabled">
       <bool>false</bool>
      </property>
     </widget>
    </item>
    <item row="4" column="0">
     <widget class="QLabel" name="label_4">
      <property name="enabled">
       <bool>false</bool>
      </property>
      <property name="text">
       <string>Phase2 algorithms:</string>
      </property>
     </widget>
    </item>
    <item row="4" column="1">
     <widget class="QLineEdit" name="esp">
      <property name="enabled">
       <bool>false</bool>
      </property>
     </widget>
    </item>
    <item row="5" column="0" colspan="2">
     <widget class="QCheckBox" name="cbForceEncaps">
      <property name="enabled">
       <bool>false</bool>
      </property>
      <property name="text">
       <string>Enforce UDP encapsulation</string>
      </property>
      <property name="checked">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item row="6" column="0" colspan="2">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="standardButtons">
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>PasswordField</class>
+   <extends>QLineEdit</extends>
+   <header>passwordfield.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections>
   <connection>
    <sender>cbEnableTunnelToHost</sender>
    <signal>toggled(bool)</signal>
    <receiver>gatewayId</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>159</x>
      <y>14</y>
     </hint>
     <hint type="destinationlabel">
      <x>209</x>
      <y>65</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>cbEnableTunnelToHost</sender>
    <signal>toggled(bool)</signal>
    <receiver>presharedKey</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>159</x>
      <y>14</y>
     </hint>
     <hint type="destinationlabel">
      <x>209</x>
      <y>91</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>cbEnableTunnelToHost</sender>
    <signal>toggled(bool)</signal>
    <receiver>ike</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>190</x>
      <y>16</y>
     </hint>
     <hint type="destinationlabel">
      <x>209</x>
      <y>65</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>cbEnableTunnelToHost</sender>
    <signal>toggled(bool)</signal>
    <receiver>esp</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>190</x>
      <y>16</y>
     </hint>
     <hint type="destinationlabel">
      <x>209</x>
      <y>65</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>cbEnableTunnelToHost</sender>
    <signal>toggled(bool)</signal>
    <receiver>cbForceEncaps</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>190</x>
      <y>16</y>
     </hint>
     <hint type="destinationlabel">
      <x>209</x>
      <y>65</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>cbEnableTunnelToHost</sender>
    <signal>toggled(bool)</signal>
    <receiver>label_2</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>190</x>
      <y>16</y>
     </hint>
     <hint type="destinationlabel">
      <x>75</x>
      <y>87</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>cbEnableTunnelToHost</sender>
    <signal>toggled(bool)</signal>
    <receiver>label</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>190</x>
      <y>16</y>
     </hint>
     <hint type="destinationlabel">
      <x>86</x>
      <y>49</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>cbEnableTunnelToHost</sender>
    <signal>toggled(bool)</signal>
    <receiver>label_3</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>190</x>
      <y>16</y>
     </hint>
     <hint type="destinationlabel">
      <x>64</x>
      <y>125</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>cbEnableTunnelToHost</sender>
    <signal>toggled(bool)</signal>
    <receiver>label_4</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>190</x>
      <y>16</y>
     </hint>
     <hint type="destinationlabel">
      <x>64</x>
      <y>163</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
    <receiver>L2tpAdvancedWidget</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>190</x>
      <y>119</y>
     </hint>
     <hint type="destinationlabel">
      <x>190</x>
      <y>68</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
    <receiver>L2tpAdvancedWidget</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>190</x>
      <y>119</y>
     </hint>
     <hint type="destinationlabel">
      <x>190</x>
      <y>68</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>