diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
index 9004b8bfe..636580c45 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -238,7 +238,7 @@ class Actions
 					$mResult = new Providers\Login\DefaultLogin();
 					break;
 				case 'domain':
-					// Providers\Domain\DomainAdminInterface
+					// Providers\Domain\DomainInterface
 					$mResult = new Providers\Domain\DefaultDomain(APP_PRIVATE_DATA . 'domains', $this->Cacher());
 					break;
 				case 'filters':
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain.php
index 8d9193759..6aa6b7d50 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain.php
@@ -14,22 +14,11 @@ class Domain extends AbstractProvider
 	 */
 	private $oPlugins;
 
-	/**
-	 * @var bool
-	 */
-	private $bAdmin;
-
 	public function __construct(Domain\DomainInterface $oDriver,
 		\RainLoop\Plugins\Manager $oPlugins)
 	{
 		$this->oDriver = $oDriver;
 		$this->oPlugins = $oPlugins;
-		$this->bAdmin = $this->oDriver instanceof Domain\DomainAdminInterface;
-	}
-
-	public function IsAdmin() : bool
-	{
-		return $this->bAdmin;
 	}
 
 	public function Load(string $sName, bool $bFindWithWildCard = false, bool $bCheckDisabled = true, bool $bCheckAliases = true) : ?\RainLoop\Model\Domain
@@ -45,7 +34,7 @@ class Domain extends AbstractProvider
 
 	public function Save(\RainLoop\Model\Domain $oDomain) : bool
 	{
-		return $this->bAdmin ? $this->oDriver->Save($oDomain) : false;
+		return $this->oDriver->Save($oDomain);
 	}
 
 	public function SaveAlias(string $sName, string $sAlias) : bool
@@ -55,80 +44,77 @@ class Domain extends AbstractProvider
 			throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::DomainAlreadyExists);
 		}
 
-		return $this->bAdmin ? $this->oDriver->SaveAlias($sName, $sAlias) : false;
+		return $this->oDriver->SaveAlias($sName, $sAlias);
 	}
 
 	public function Delete(string $sName) : bool
 	{
-		return $this->bAdmin ? $this->oDriver->Delete($sName) : false;
+		return $this->oDriver->Delete($sName);
 	}
 
 	public function Disable(string $sName, bool $bDisabled) : bool
 	{
-		return $this->bAdmin ? $this->oDriver->Disable($sName, $bDisabled) : false;
+		return $this->oDriver->Disable($sName, $bDisabled);
 	}
 
 	public function GetList(bool $bIncludeAliases = true) : array
 	{
-		return $this->bAdmin ? $this->oDriver->GetList($bIncludeAliases) : array();
+		return $this->oDriver->GetList($bIncludeAliases);
 	}
 
 	public function LoadOrCreateNewFromAction(\RainLoop\Actions $oActions, string $sNameForTest = null) : ?\RainLoop\Model\Domain
 	{
 		$oDomain = null;
 
-		if ($this->bAdmin)
+		$sName = (string) $oActions->GetActionParam('Name', '');
+
+		if (\strlen($sName) && $sNameForTest && !\str_contains($sName, '*'))
 		{
-			$sName = (string) $oActions->GetActionParam('Name', '');
+			$sNameForTest = null;
+		}
 
-			if (\strlen($sName) && $sNameForTest && !\str_contains($sName, '*'))
+		if (\strlen($sName) || $sNameForTest)
+		{
+			$bCreate = !empty($oActions->GetActionParam('Create', 0));
+			$sIncHost = (string) $oActions->GetActionParam('IncHost', '');
+			$iIncPort = (int) $oActions->GetActionParam('IncPort', 143);
+			$iIncSecure = (int) $oActions->GetActionParam('IncSecure', \MailSo\Net\Enumerations\ConnectionSecurityType::NONE);
+			$bIncShortLogin = '1' === (string) $oActions->GetActionParam('IncShortLogin', '0');
+			$bUseSieve = '1' === (string) $oActions->GetActionParam('UseSieve', '0');
+			$sSieveHost = (string) $oActions->GetActionParam('SieveHost', '');
+			$iSievePort = (int) $oActions->GetActionParam('SievePort', 4190);
+			$iSieveSecure = (int) $oActions->GetActionParam('SieveSecure', \MailSo\Net\Enumerations\ConnectionSecurityType::NONE);
+			$sOutHost = (string) $oActions->GetActionParam('OutHost', '');
+			$iOutPort = (int) $oActions->GetActionParam('OutPort', 25);
+			$iOutSecure = (int) $oActions->GetActionParam('OutSecure', \MailSo\Net\Enumerations\ConnectionSecurityType::NONE);
+			$bOutShortLogin = '1' === (string) $oActions->GetActionParam('OutShortLogin', '0');
+			$bOutAuth = '1' === (string) $oActions->GetActionParam('OutAuth', '1');
+			$bOutSetSender = '1' === (string) $oActions->GetActionParam('OutSetSender', '0');
+			$bOutUsePhpMail = '1' === (string) $oActions->GetActionParam('OutUsePhpMail', '0');
+			$sWhiteList = (string) $oActions->GetActionParam('WhiteList', '');
+
+			$oDomain = $sNameForTest ? null : $this->Load($sName);
+			if ($oDomain instanceof \RainLoop\Model\Domain)
 			{
-				$sNameForTest = null;
+				if ($bCreate)
+				{
+					throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::DomainAlreadyExists);
+				}
+			}
+			else
+			{
+				$oDomain = new \RainLoop\Model\Domain($sNameForTest ?: $sName);
 			}
 
-			if (\strlen($sName) || $sNameForTest)
-			{
-				$bCreate = !empty($oActions->GetActionParam('Create', 0));
-				$sIncHost = (string) $oActions->GetActionParam('IncHost', '');
-				$iIncPort = (int) $oActions->GetActionParam('IncPort', 143);
-				$iIncSecure = (int) $oActions->GetActionParam('IncSecure', \MailSo\Net\Enumerations\ConnectionSecurityType::NONE);
-				$bIncShortLogin = '1' === (string) $oActions->GetActionParam('IncShortLogin', '0');
-				$bUseSieve = '1' === (string) $oActions->GetActionParam('UseSieve', '0');
-				$sSieveHost = (string) $oActions->GetActionParam('SieveHost', '');
-				$iSievePort = (int) $oActions->GetActionParam('SievePort', 4190);
-				$iSieveSecure = (int) $oActions->GetActionParam('SieveSecure', \MailSo\Net\Enumerations\ConnectionSecurityType::NONE);
-				$sOutHost = (string) $oActions->GetActionParam('OutHost', '');
-				$iOutPort = (int) $oActions->GetActionParam('OutPort', 25);
-				$iOutSecure = (int) $oActions->GetActionParam('OutSecure', \MailSo\Net\Enumerations\ConnectionSecurityType::NONE);
-				$bOutShortLogin = '1' === (string) $oActions->GetActionParam('OutShortLogin', '0');
-				$bOutAuth = '1' === (string) $oActions->GetActionParam('OutAuth', '1');
-				$bOutSetSender = '1' === (string) $oActions->GetActionParam('OutSetSender', '0');
-				$bOutUsePhpMail = '1' === (string) $oActions->GetActionParam('OutUsePhpMail', '0');
-				$sWhiteList = (string) $oActions->GetActionParam('WhiteList', '');
+			$sIncHost = \MailSo\Base\Utils::IdnToAscii($sIncHost);
+			$sSieveHost = \MailSo\Base\Utils::IdnToAscii($sSieveHost);
+			$sOutHost = \MailSo\Base\Utils::IdnToAscii($sOutHost);
 
-				$oDomain = $sNameForTest ? null : $this->Load($sName);
-				if ($oDomain instanceof \RainLoop\Model\Domain)
-				{
-					if ($bCreate)
-					{
-						throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::DomainAlreadyExists);
-					}
-				}
-				else
-				{
-					$oDomain = new \RainLoop\Model\Domain($sNameForTest ?: $sName);
-				}
-
-				$sIncHost = \MailSo\Base\Utils::IdnToAscii($sIncHost);
-				$sSieveHost = \MailSo\Base\Utils::IdnToAscii($sSieveHost);
-				$sOutHost = \MailSo\Base\Utils::IdnToAscii($sOutHost);
-
-				$oDomain->SetConfig(
-					$sIncHost, $iIncPort, $iIncSecure, $bIncShortLogin,
-					$bUseSieve, $sSieveHost, $iSievePort, $iSieveSecure,
-					$sOutHost, $iOutPort, $iOutSecure, $bOutShortLogin, $bOutAuth, $bOutSetSender, $bOutUsePhpMail,
-					$sWhiteList);
-			}
+			$oDomain->SetConfig(
+				$sIncHost, $iIncPort, $iIncSecure, $bIncShortLogin,
+				$bUseSieve, $sSieveHost, $iSievePort, $iSieveSecure,
+				$sOutHost, $iOutPort, $iOutSecure, $bOutShortLogin, $bOutAuth, $bOutSetSender, $bOutUsePhpMail,
+				$sWhiteList);
 		}
 
 		return $oDomain;
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain/DefaultDomain.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain/DefaultDomain.php
index 919beb838..e99267ae3 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain/DefaultDomain.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain/DefaultDomain.php
@@ -2,7 +2,7 @@
 
 namespace RainLoop\Providers\Domain;
 
-class DefaultDomain implements \RainLoop\Providers\Domain\DomainAdminInterface
+class DefaultDomain implements DomainInterface
 {
 	/**
 	 * @var string
@@ -22,25 +22,17 @@ class DefaultDomain implements \RainLoop\Providers\Domain\DomainAdminInterface
 
 	public function codeFileName(string $sName, bool $bBack = false) : string
 	{
-		if ($bBack && 'default' === $sName)
-		{
+		if ($bBack && 'default' === $sName) {
 			return '*';
 		}
-		else if (!$bBack && '*' === $sName)
-		{
+
+		if (!$bBack && '*' === $sName) {
 			return 'default';
 		}
 
-		if ($bBack)
-		{
-			$sName = \MailSo\Base\Utils::IdnToUtf8($sName, true);
-		}
-		else
-		{
-			$sName = \MailSo\Base\Utils::IdnToAscii($sName, true);
-		}
-
-		return $bBack ? \str_replace('_wildcard_', '*', $sName) : \str_replace('*', '_wildcard_', $sName);
+		return $bBack
+			? \str_replace('_wildcard_', '*', \MailSo\Base\Utils::IdnToUtf8($sName, true))
+			: \str_replace('*', '_wildcard_', \MailSo\Base\Utils::IdnToAscii($sName, true));
 	}
 
 	private function wildcardDomainsCacheKey() : string
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain/DomainAdminInterface.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain/DomainAdminInterface.php
deleted file mode 100644
index f0db39308..000000000
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain/DomainAdminInterface.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-namespace RainLoop\Providers\Domain;
-
-interface DomainAdminInterface extends DomainInterface
-{
-
-	public function Disable(string $sName, bool $bDisable) : bool;
-
-	public function Load(string $sName, bool $bFindWithWildCard = false, bool $bCheckDisabled = true) : ?\RainLoop\Model\Domain;
-
-	public function Save(\RainLoop\Model\Domain $oDomain) : bool;
-
-	public function Delete(string $sName) : bool;
-
-	public function GetList(bool $bIncludeAliases = true) : array;
-}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain/DomainInterface.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain/DomainInterface.php
index 97b0e3d89..27a5c9ea2 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain/DomainInterface.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain/DomainInterface.php
@@ -4,4 +4,13 @@ namespace RainLoop\Providers\Domain;
 
 interface DomainInterface
 {
-}
\ No newline at end of file
+	public function Disable(string $sName, bool $bDisable) : bool;
+
+	public function Load(string $sName, bool $bFindWithWildCard = false, bool $bCheckDisabled = true) : ?\RainLoop\Model\Domain;
+
+	public function Save(\RainLoop\Model\Domain $oDomain) : bool;
+
+	public function Delete(string $sName) : bool;
+
+	public function GetList(bool $bIncludeAliases = true) : array;
+}