diff --git a/editdialog.cpp b/editdialog.cpp
index 7e4eb0ca..1b795efc 100755
--- a/editdialog.cpp
+++ b/editdialog.cpp
@@ -29,6 +29,8 @@ static int token_tab(int mode)
             return 0;
         case OC_TOKEN_MODE_TOTP:
             return 1;
+        case OC_TOKEN_MODE_STOKEN:
+            return 2;
         default:
             return -1;
     }
@@ -36,7 +38,8 @@ static int token_tab(int mode)
 
 int token_rtab[] = {
     [0] = OC_TOKEN_MODE_HOTP,
-    [1] = OC_TOKEN_MODE_TOTP
+    [1] = OC_TOKEN_MODE_TOTP,
+    [2] = OC_TOKEN_MODE_STOKEN
 };
 
 EditDialog::EditDialog(QString server, QSettings *settings, QWidget *parent) :
diff --git a/editdialog.ui b/editdialog.ui
index c3169e51..fe2eab5b 100755
--- a/editdialog.ui
+++ b/editdialog.ui
@@ -336,7 +336,7 @@
           </size>
          </property>
          <property name="currentIndex">
-          <number>-1</number>
+          <number>0</number>
          </property>
          <property name="maxVisibleItems">
           <number>3</number>
@@ -351,6 +351,11 @@
            <string notr="true">TOTP (RFC6238)</string>
           </property>
          </item>
+         <item>
+          <property name="text">
+           <string>STOKEN (RSA)</string>
+          </property>
+         </item>
         </widget>
        </item>
        <item>