diff --git a/models/MatrixAccount.php b/models/MatrixAccount.php
index 7575dd5d061f2ec945d1fa06219cc8ab98b4cc87..2d967259c120134091bc46bad1f668430cbaa5ca 100644
--- a/models/MatrixAccount.php
+++ b/models/MatrixAccount.php
@@ -58,12 +58,12 @@ class MatrixAccount extends SimpleORMap
     {
         if (trim(Config::get()->MATRIX_SYSTEM_ACCOUNT_USERNAME) != '' &&
                 (trim(Config::get()->MATRIX_SYSTEM_ACCOUNT_PASSWORD) != '' ||
-                    trim(Config::get()->MATRIX_SYSTEM_ACCOUNT_TOKEN) != '')) {
+                    trim(Config::get()->MATRIX_SYSTEM_ACCOUNT_LOGIN_TOKEN) != '')) {
 
             // Login token specified, use this.
-            if (trim(Config::get()->MATRIX_SYSTEM_ACCOUNT_TOKEN) != '') {
+            if (trim(Config::get()->MATRIX_SYSTEM_ACCOUNT_LOGIN_TOKEN) != '') {
                 $account = new Patrix\Account(trim(Config::get()->MATRIX_SYSTEM_ACCOUNT_USERNAME), '',
-                    trim(Config::get()->MATRIX_SYSTEM_ACCOUNT_TOKEN));
+                    trim(Config::get()->MATRIX_SYSTEM_ACCOUNT_LOGIN_TOKEN));
             // No token, login by username and password.
             } else {
                 $account = new Patrix\Account(trim(Config::get()->MATRIX_SYSTEM_ACCOUNT_USERNAME),
diff --git a/plugin.manifest b/plugin.manifest
index 82b8eb1ef96cf70b538c557dc18c8d9ba3d33d54..32c43c02e1fc561ab524c222d30dec3b9a5cf8e5 100644
--- a/plugin.manifest
+++ b/plugin.manifest
@@ -1,7 +1,7 @@
 pluginname=Matrix-Chat
 pluginclassname=MatrixPlugin
 origin=data-quest
-version=1.1.q
+version=1.1.1
 screenshot=assets/images/matrix_logo.png
 description=Matrix chat for Stud.IP courses
 studipMinVersion=4.5