diff --git a/rainloop/VERSION b/rainloop/VERSION
index dfda3e0b..f3b5af39 100755
--- a/rainloop/VERSION
+++ b/rainloop/VERSION
@@ -1 +1 @@
-6.1.0
+6.1.1
diff --git a/rainloop/admin.php b/rainloop/admin.php
index 57cc3043..a01f6bc8 100755
--- a/rainloop/admin.php
+++ b/rainloop/admin.php
@@ -8,7 +8,10 @@
  * Based initially on https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
  */
 
-OCP\User::checkAdminUser();
+#OCP\User::checkAdminUser();
+if (!OC_User::isAdminUser(OC_User::getUser())) {
+	return;
+}
 
 OCP\Util::addScript('rainloop', 'admin');
 
diff --git a/rainloop/appinfo/info.xml b/rainloop/appinfo/info.xml
index 15fe3438..44724bfa 100644
--- a/rainloop/appinfo/info.xml
+++ b/rainloop/appinfo/info.xml
@@ -4,7 +4,7 @@
 	<name>RainLoop</name>
 	<summary>RainLoop Webmail</summary>
 	<description>Simple, modern and fast web-based email client. After enabling in Nextcloud, go to Nextcloud admin panel, "Additionnal settings" and you will see a "Rainloop webmail" section. There, click on the link to go to the Rainloop admin panel. The default user/password is admin/12345. This version is based on Rainloop 1.14.0 (2020-01).</description>
-	<version>6.1.0</version>
+	<version>6.1.1</version>
 	<licence>agpl</licence>
 	<author>RainLoop Team, Nextgen-Networks, Tab Fitts, Pierre-Alain Bandinelli</author>
 	<dependencies>
diff --git a/rainloop/appinfo/version b/rainloop/appinfo/version
index dfda3e0b..f3b5af39 100755
--- a/rainloop/appinfo/version
+++ b/rainloop/appinfo/version
@@ -1 +1 @@
-6.1.0
+6.1.1