diff --git a/vpn/pptp/pptpauth.cpp b/vpn/pptp/pptpauth.cpp
index a2b1255e..3b7a1c8a 100644
--- a/vpn/pptp/pptpauth.cpp
+++ b/vpn/pptp/pptpauth.cpp
@@ -1,70 +1,72 @@
 /*
     Copyright 2011 Ilia Kats <ilia-kats@gmx.net>
     Copyright 2013 Lukáš Tinkl <ltinkl@redhat.com>
 
     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 2 of
     the License or (at your option) version 3 or any later version
     accepted by the membership of KDE e.V. (or its successor approved
     by the membership of KDE e.V.), which shall act as a proxy
     defined in Section 14 of version 3 of the license.
 
     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/>.
 */
 
 #include "pptpauth.h"
 #include "ui_pptpauth.h"
 
 #include "nm-pptp-service.h"
 
 class PptpAuthWidgetPrivate
 {
 public:
     NetworkManager::VpnSetting::Ptr setting;
     Ui_PptpAuthenticationWidget ui;
 };
 
 PptpAuthWidget::PptpAuthWidget(const NetworkManager::VpnSetting::Ptr &setting, QWidget * parent)
 : SettingWidget(setting, parent), d_ptr(new PptpAuthWidgetPrivate)
 {
     Q_D(PptpAuthWidget);
     d->setting = setting;
     d->ui.setupUi(this);
     connect(d->ui.chkShowPassword, SIGNAL(toggled(bool)), this, SLOT(showPasswordsToggled(bool)));
 
+    d->ui.lePassword->setFocus(Qt::OtherFocusReason);
+
     KAcceleratorManager::manage(this);
 }
 
 PptpAuthWidget::~PptpAuthWidget()
 {
     delete d_ptr;
 }
 
 QVariantMap PptpAuthWidget::setting(bool agentOwned) const
 {
     Q_D(const PptpAuthWidget);
     Q_UNUSED(agentOwned)
 
     NMStringMap secrets;
     QVariantMap secretData;
 
     if (!d->ui.lePassword->text().isEmpty()) {
         secrets.insert(QLatin1String(NM_PPTP_KEY_PASSWORD), d->ui.lePassword->text());
     }
 
     secretData.insert("secrets", QVariant::fromValue<NMStringMap>(secrets));
     return secretData;
 }
 
 void PptpAuthWidget::showPasswordsToggled(bool toggled)
 {
     Q_D(PptpAuthWidget);
     d->ui.lePassword->setPasswordMode(!toggled);
 }
diff --git a/vpn/pptp/pptpauth.ui b/vpn/pptp/pptpauth.ui
index 86bbdb89..a3d7948b 100644
--- a/vpn/pptp/pptpauth.ui
+++ b/vpn/pptp/pptpauth.ui
@@ -1,80 +1,80 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>PptpAuthenticationWidget</class>
  <widget class="QWidget" name="PptpAuthenticationWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>372</width>
+    <width>429</width>
     <height>85</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>PPTPAuthentication</string>
   </property>
   <layout class="QFormLayout" name="formLayout">
    <property name="sizeConstraint">
     <enum>QLayout::SetMinimumSize</enum>
    </property>
    <property name="margin">
     <number>0</number>
    </property>
    <item row="0" column="0">
     <widget class="QLabel" name="textLabel1">
      <property name="text">
       <string>Password:</string>
      </property>
      <property name="wordWrap">
       <bool>false</bool>
      </property>
      <property name="buddy">
       <cstring>lePassword</cstring>
      </property>
     </widget>
    </item>
-   <item row="1" column="1">
+   <item row="1" column="0" colspan="2">
     <widget class="QCheckBox" name="chkShowPassword">
      <property name="text">
       <string>Show password</string>
      </property>
     </widget>
    </item>
    <item row="2" column="1">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>0</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="0" column="1">
     <widget class="KLineEdit" name="lePassword">
      <property name="passwordMode">
       <bool>true</bool>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
    <class>KLineEdit</class>
    <extends>QLineEdit</extends>
    <header>klineedit.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>lePassword</tabstop>
   <tabstop>chkShowPassword</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>