diff --git a/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php b/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
index 6bb496e35..9191b52f8 100644
--- a/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
+++ b/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
@@ -65,12 +65,12 @@ class SnappyMailHelper {
 		{
 			self::regSnappyMailDataFunction();
 
-			$_ENV['RAINLOOP_INCLUDE_AS_API'] = true;
+			$_ENV['SNAPPYMAIL_INCLUDE_AS_API'] = true;
 			include $sPath;
 
-			if (class_exists('\\SnappyMail\\Api'))
+			if (class_exists('\\RainLoop\\Api'))
 			{
-				$SsoHash = \SnappyMail\Api::GetUserSsoHash($sEmail, $sPassword);
+				$SsoHash = \RainLoop\Api::GetUserSsoHash($sEmail, $sPassword);
 			}
 		}
 
@@ -238,10 +238,10 @@ class SnappyMailHelper {
 
 		self::regSnappyMailDataFunction();
 
-		$_ENV['RAINLOOP_INCLUDE_AS_API'] = true;
+		$_ENV['SNAPPYMAIL_INCLUDE_AS_API'] = true;
 		include $sApiPath;
 
-		\SnappyMail\Api::LogoutCurrentLogginedUser();
+		\RainLoop\Api::LogoutCurrentLogginedUser();
 
 		return true;
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
index bf18f3ffd..978a5d8d2 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
@@ -661,8 +661,8 @@ class ServiceActions
 					$sEmail = \trim($aData['Email']);
 					$sPassword = $aData['Password'];
 
-					$aAdditionalOptions = isset($aData['AdditionalOptions']) && \is_array($aData['AdditionalOptions']) &&
-						\count($aData['AdditionalOptions']) ? $aData['AdditionalOptions'] : null;
+					$aAdditionalOptions = (isset($aData['AdditionalOptions']) && \is_array($aData['AdditionalOptions']))
+						? $aData['AdditionalOptions'] : [];
 
 					try
 					{
diff --git a/snappymail/v/0.0.0/include.php b/snappymail/v/0.0.0/include.php
index 26bbcb0b5..6ddb5ac65 100644
--- a/snappymail/v/0.0.0/include.php
+++ b/snappymail/v/0.0.0/include.php
@@ -158,7 +158,7 @@ if (!defined('RAINLOOP_APP_LIBRARIES_PATH')) {
 if (class_exists('RainLoop\\Api')) {
 	RainLoop\Api::Handle();
 	// NextCloud/OwnCloud?
-	if (empty($_ENV['RAINLOOP_INCLUDE_AS_API'])) {
+	if (empty($_ENV['SNAPPYMAIL_INCLUDE_AS_API'])) {
 		RainLoop\Service::Handle();
 		exit(0);
 	}
diff --git a/test/sso.php b/test/sso.php
new file mode 100644
index 000000000..604cb55a5
--- /dev/null
+++ b/test/sso.php
@@ -0,0 +1,21 @@
+<?php
+
+// Enable SnappyMail Api and include index file
+$_ENV['SNAPPYMAIL_INCLUDE_AS_API'] = true;
+require '../index.php';
+
+/**
+ * Get SSO hash
+ */
+$aAdditionalOptions = array(
+	// One of /snappymail/v/0.0.0/app/localization/*
+//	'Language' = 'en-US'
+);
+$bUseTimeout = true; // 10 seconds
+$ssoHash = \RainLoop\Api::CreateUserSsoHash($sEmail, $sPassword, $aAdditionalOptions, $bUseTimeout);
+
+// redirect to webmail sso url
+\header('Location: https://yourdomain.com/snappymail/?sso&hash='.$ssoHash);
+
+// Destroy the SSO hash
+//\RainLoop\Api::ClearUserSsoHash($ssoHash);