diff --git a/vpn/fortisslvpn/fortisslvpnadvanced.ui b/vpn/fortisslvpn/fortisslvpnadvanced.ui
--- a/vpn/fortisslvpn/fortisslvpnadvanced.ui
+++ b/vpn/fortisslvpn/fortisslvpnadvanced.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>410</width>
-    <height>110</height>
+    <width>400</width>
+    <height>175</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -24,6 +24,28 @@
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title">
+      <string>Autentication</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
+       <widget class="QCheckBox" name="otp">
+        <property name="text">
+         <string>Use a One-Time Password</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="0">
     <widget class="QGroupBox" name="groupBox">
      <property name="sizePolicy">
       <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
@@ -58,7 +80,7 @@
      </layout>
     </widget>
    </item>
-   <item row="1" column="0">
+   <item row="2" column="0">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
diff --git a/vpn/fortisslvpn/fortisslvpnauth.cpp b/vpn/fortisslvpn/fortisslvpnauth.cpp
--- a/vpn/fortisslvpn/fortisslvpnauth.cpp
+++ b/vpn/fortisslvpn/fortisslvpnauth.cpp
@@ -40,6 +40,13 @@
     d->ui.setupUi(this);
     d->setting = setting;
 
+    const NetworkManager::Setting::SecretFlags otpFlag = static_cast<NetworkManager::Setting::SecretFlags>(data.value(NM_FORTISSLVPN_KEY_OTP"-flags").toInt());
+    if (otpFlag == NetworkManager::Setting::NotSaved){
+        d->ui.otpFrame->setVisible(true);
+    } else {
+        d->ui.otpFrame->setVisible(false);
+    }
+    
     KAcceleratorManager::manage(this);
 }
 
@@ -58,6 +65,13 @@
     if (!d->ui.password->text().isEmpty()) {
         secrets.insert(QLatin1String(NM_FORTISSLVPN_KEY_PASSWORD), d->ui.password->text());
     }
+    
+    if (!data.value(NM_FORTISSLVPN_KEY_OTP"-flags").isEmpty()){
+        const NetworkManager::Setting::SecretFlags otpFlag = static_cast<NetworkManager::Setting::SecretFlags>(data.value(NM_FORTISSLVPN_KEY_OTP"-flags").toInt());
+        if (otpFlag == NetworkManager::Setting::NotSaved && !d->ui.otp->text().isEmpty()){
+            secrets.insert(QLatin1String(NM_FORTISSLVPN_KEY_OTP),d->ui.otp->text());
+        }
+    }
 
     secretData.insert("secrets", QVariant::fromValue<NMStringMap>(secrets));
     return secretData;
diff --git a/vpn/fortisslvpn/fortisslvpnauth.ui b/vpn/fortisslvpn/fortisslvpnauth.ui
--- a/vpn/fortisslvpn/fortisslvpnauth.ui
+++ b/vpn/fortisslvpn/fortisslvpnauth.ui
@@ -34,6 +34,38 @@
      </property>
     </widget>
    </item>
+   <item row="1" column="0" colspan="2">
+    <widget class="QFrame" name="otpFrame">
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <layout class="QFormLayout" name="formLayout_1">
+      <property name="verticalSpacing">
+       <number>0</number>
+      </property>
+      <item row="0" column="1">
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>One Time Password</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="otpLabel">
+        <property name="text">
+         <string>Token:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="PasswordField" name="otp"/>
+      </item>
+     </layout>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>
diff --git a/vpn/fortisslvpn/fortisslvpnwidget.cpp b/vpn/fortisslvpn/fortisslvpnwidget.cpp
--- a/vpn/fortisslvpn/fortisslvpnwidget.cpp
+++ b/vpn/fortisslvpn/fortisslvpnwidget.cpp
@@ -128,6 +128,12 @@
         d->advUi.trustedCert->setText(trustedCert);
     }
 
+    if (!data.value(NM_FORTISSLVPN_KEY_OTP"-flags").isEmpty()){
+        const NetworkManager::Setting::SecretFlags otpFlag = static_cast<NetworkManager::Setting::SecretFlags>(data.value(NM_FORTISSLVPN_KEY_OTP"-flags").toInt());
+        if (otpFlag & NetworkManager::Setting::NotSaved){
+            d->advUi.otp->setChecked(true);
+        }
+    }
     loadSecrets(setting);
 }
 
@@ -190,7 +196,19 @@
     if (!d->advUi.trustedCert->text().isEmpty()) {
         data.insert(NM_FORTISSLVPN_KEY_TRUSTED_CERT, d->advUi.trustedCert->text());
     }
-
+    
+    const NMStringMap prevData = d->setting->data();
+    if (!prevData.value(NM_FORTISSLVPN_KEY_OTP"-flags").isEmpty()){
+        const NetworkManager::Setting::SecretFlags otpFlag = static_cast<NetworkManager::Setting::SecretFlags>(data.value(NM_FORTISSLVPN_KEY_OTP"-flags").toInt());
+    } else {
+        otpFlag = NULL;
+    }
+    if (d->advUi.otp->isChecked()){
+        data.insert(QLatin1String(NM_FORTISSLVPN_KEY_OTP"-flags"), QString::number(otpFlags | NetworkManager::Setting::NotSaved);
+    } else {
+        data.insert(QLatin1String(NM_FORTISSLVPN_KEY_OTP"-flags"), QString::number(otpFlags & ~NetworkManager::Setting::NotSaved);
+    }
+    
     setting.setData(data);
     setting.setSecrets(secrets);
 
diff --git a/vpn/fortisslvpn/nm-fortisslvpn-service.h b/vpn/fortisslvpn/nm-fortisslvpn-service.h
--- a/vpn/fortisslvpn/nm-fortisslvpn-service.h
+++ b/vpn/fortisslvpn/nm-fortisslvpn-service.h
@@ -32,6 +32,7 @@
 #define NM_FORTISSLVPN_KEY_GATEWAY           "gateway"
 #define NM_FORTISSLVPN_KEY_USER              "user"
 #define NM_FORTISSLVPN_KEY_PASSWORD          "password"
+#define NM_FORTISSLVPN_KEY_OTP               "otp"
 #define NM_FORTISSLVPN_KEY_CA                "ca"
 #define NM_FORTISSLVPN_KEY_CERT              "cert"
 #define NM_FORTISSLVPN_KEY_KEY               "key"